From nobody Fri May 8 04:35:01 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4E60C433F5 for ; Wed, 11 May 2022 06:25:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242035AbiEKGZk (ORCPT ); Wed, 11 May 2022 02:25:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241366AbiEKGZe (ORCPT ); Wed, 11 May 2022 02:25:34 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D25EA22B387 for ; Tue, 10 May 2022 23:25:24 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id p12so1179163pfn.0 for ; Tue, 10 May 2022 23:25:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wistron-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=A5C7OXci5nwdErfgICDesxwtivpbKyTExi4Vox7FELc=; b=FQWTpU+quExij5RCPnOU3jbV6rQpIFmAI694/Fy0FxoYtCSzOvuPp18azYSHLEE5aI fEvGE7W+hIxZ1IptkIiNXz3LLpRkd6xAKn1p2p7+uR3ckfmAOBwDNUGrXK2Gk17hAKb5 Ga+OL780NGq7hZ+P+E+bCqEDChZXQgvz8lJOgj89q4WEGzlXPMDbz5Tg/76M8EGVFgf8 FEWFWqeWNekP9lkzcKcgHoCyvMwMOL0EM+Ty1Cju1a8Mo9T80rm8eLLTRGy+YuBhB0NL 4frSR+fuZIZeV4g53ubZr9yPqSwnmzsyiReLlhArC/huGfBg2NvabTPyvl/V+YbOFn9h AWDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=A5C7OXci5nwdErfgICDesxwtivpbKyTExi4Vox7FELc=; b=50RogpJece8CwB85zTvXuPBnv03O5KroFQZgx+K9B4tc2ZUkfdjkg+NPIwAfhlzmy/ VwhsFYV9Ti7kwrXKadMYJ7XMvdeDzmj0rQry3umJKbwq3S590R1pZJRA5F9iNOPx0rtg Uos0kheoJGIEsOU7VCfd4DsF9a0TEINV64IY8IyWL8e4LFnTk6QnPJXPyOFWkqVdvGdR EjApOOw5NTw0bbt5QWceWX2DokTR+aGwjeivLhyOf8G1qbVPFsTdv90QB1Vp/60wVNWz e4MpkIcKU5DV7xUUKaDahtCU6xnX15lUiAB05cbBXTFUMTwKEFEeFLkTF/VqU3kdlWPT hZGQ== X-Gm-Message-State: AOAM532u7D5ZGi/tfJeX0npTZw6aIHLnMX9raOuappt90ObII56x10Wa PGayDHyxJ+bNZvEuWOCuhLq3+9RcEr6IyjwNimw= X-Google-Smtp-Source: ABdhPJy/oQDgFkEh/tjm9dOvcT7za1mLaFGJQzSWvsGrFaolHaJawbYZUnPZfQ64jixTAsvL28QOVg== X-Received: by 2002:a63:2a4f:0:b0:3c1:bf77:b81f with SMTP id q76-20020a632a4f000000b003c1bf77b81fmr19650508pgq.364.1652250324273; Tue, 10 May 2022 23:25:24 -0700 (PDT) Received: from localhost.localdomain ([2402:7500:478:2175:74a6:2181:e968:3721]) by smtp.gmail.com with ESMTPSA id i3-20020a17090a64c300b001cd4989ff4esm839533pjm.21.2022.05.10.23.25.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 23:25:24 -0700 (PDT) From: Terry Chen To: alsa-devel@alsa-project.org Cc: cezary.rojewski@intel.com, pierre-louis.bossart@linux.intel.com, liam.r.girdwood@linux.intel.com, yang.jie@linux.intel.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, brent.lu@intel.com, cujomalainey@chromium.org, seanpaul@chromium.org, terry_chen@wistron.corp-partner.google.com, casey.g.bowman@intel.com, mark_hsieh@wistron.corp-partner.google.com, vamshi.krishna.gopal@intel.com, mac.chiang@intel.com, kai.vehmanen@linux.intel.com, linux-kernel@vger.kernel.org Subject: [PATCH] [v3]FROMLIST: ASoC: Intel: sof_cs42l42: adding support for ADL configuration and BT offload audio Date: Wed, 11 May 2022 14:25:14 +0800 Message-Id: <20220511062514.1743838-1-terry_chen@wistron.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" To be able to do driver data for adl_mx98360a_cs4242 which supports two max98360a speaker amplifiers on SSP1 and cs42l42 headphone codec on SSP0 running on ADL platform. Also add the capability to machine driver of creating DAI Link for BT offload. Although BT offload always uses SSP2 port but we reserve the flexibility to assign the port number in macro. Signed-off-by: Terry Chen --- sound/soc/intel/boards/sof_cs42l42.c | 92 ++++++++++++++++++- .../intel/common/soc-acpi-intel-adl-match.c | 8 ++ 2 files changed, 96 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/boards/sof_cs42l42.c b/sound/soc/intel/boards/= sof_cs42l42.c index ce78c18798876..e7711480922cd 100644 --- a/sound/soc/intel/boards/sof_cs42l42.c +++ b/sound/soc/intel/boards/sof_cs42l42.c @@ -41,8 +41,13 @@ #define SOF_CS42L42_DAILINK_MASK (GENMASK(24, 10)) #define SOF_CS42L42_DAILINK(link1, link2, link3, link4, link5) \ ((((link1) | ((link2) << 3) | ((link3) << 6) | ((link4) << 9) | ((link5) = << 12)) << SOF_CS42L42_DAILINK_SHIFT) & SOF_CS42L42_DAILINK_MASK) -#define SOF_MAX98357A_SPEAKER_AMP_PRESENT BIT(25) -#define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(26) +#define SOF_BT_OFFLOAD_PRESENT BIT(25) +#define SOF_CS42L42_SSP_BT_SHIFT 26 +#define SOF_CS42L42_SSP_BT_MASK (GENMASK(28, 26)) +#define SOF_CS42L42_SSP_BT(quirk) \ + (((quirk) << SOF_CS42L42_SSP_BT_SHIFT) & SOF_CS42L42_SSP_BT_MASK) +#define SOF_MAX98357A_SPEAKER_AMP_PRESENT BIT(29) +#define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(30) =20 enum { LINK_NONE =3D 0, @@ -50,6 +55,7 @@ enum { LINK_SPK =3D 2, LINK_DMIC =3D 3, LINK_HDMI =3D 4, + LINK_BT =3D 5, }; =20 /* Default: SSP2 */ @@ -278,6 +284,13 @@ static struct snd_soc_dai_link_component dmic_componen= t[] =3D { } }; =20 +static struct snd_soc_dai_link_component dummy_component[] =3D { + { + .name =3D "snd-soc-dummy", + .dai_name =3D "snd-soc-dummy-dai", + } +}; + static int create_spk_amp_dai_links(struct device *dev, struct snd_soc_dai_link *links, struct snd_soc_dai_link_component *cpus, @@ -467,9 +480,56 @@ static int create_hdmi_dai_links(struct device *dev, return -ENOMEM; } =20 +static int create_bt_offload_dai_links(struct device *dev, + struct snd_soc_dai_link *links, + struct snd_soc_dai_link_component *cpus, + int *id, int ssp_bt) +{ + int ret =3D 0; + + /* bt offload */ + if (!(sof_cs42l42_quirk & SOF_BT_OFFLOAD_PRESENT)) + return 0; + + links[*id].name =3D devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", + ssp_bt); + if (!links[*id].name) { + ret =3D -ENOMEM; + goto devm_err; + } + + links[*id].id =3D *id; + links[*id].codecs =3D dummy_component; + links[*id].num_codecs =3D ARRAY_SIZE(dummy_component); + links[*id].platforms =3D platform_component; + links[*id].num_platforms =3D ARRAY_SIZE(platform_component); + + links[*id].dpcm_playback =3D 1; + links[*id].dpcm_capture =3D 1; + links[*id].no_pcm =3D 1; + links[*id].cpus =3D &cpus[*id]; + links[*id].num_cpus =3D 1; + + links[*id].cpus->dai_name =3D devm_kasprintf(dev, GFP_KERNEL, + "SSP%d Pin", + ssp_bt); + if (!links[*id].cpus->dai_name) { + ret =3D -ENOMEM; + goto devm_err; + } + + (*id)++; + + return 0; + +devm_err: + return -ENOMEM; +} + static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *d= ev, int ssp_codec, int ssp_amp, + int ssp_bt, int dmic_be_num, int hdmi_num) { @@ -522,6 +582,14 @@ static struct snd_soc_dai_link *sof_card_dai_links_cre= ate(struct device *dev, goto devm_err; } break; + case LINK_BT: + ret =3D create_bt_offload_dai_links(dev, links, cpus, &id, ssp_bt); + if (ret < 0) { + dev_err(dev, "fail to create bt offload dai links, ret %d\n", + ret); + goto devm_err; + } + break; case LINK_NONE: /* caught here if it's not used as terminator in macro */ default: @@ -543,7 +611,7 @@ static int sof_audio_probe(struct platform_device *pdev) struct snd_soc_acpi_mach *mach; struct sof_card_private *ctx; int dmic_be_num, hdmi_num; - int ret, ssp_amp, ssp_codec; + int ret, ssp_bt, ssp_amp, ssp_codec; =20 ctx =3D devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -568,6 +636,9 @@ static int sof_audio_probe(struct platform_device *pdev) =20 dev_dbg(&pdev->dev, "sof_cs42l42_quirk =3D %lx\n", sof_cs42l42_quirk); =20 + ssp_bt =3D (sof_cs42l42_quirk & SOF_CS42L42_SSP_BT_MASK) >> + SOF_CS42L42_SSP_BT_SHIFT; + ssp_amp =3D (sof_cs42l42_quirk & SOF_CS42L42_SSP_AMP_MASK) >> SOF_CS42L42_SSP_AMP_SHIFT; =20 @@ -578,9 +649,11 @@ static int sof_audio_probe(struct platform_device *pde= v) =20 if (sof_cs42l42_quirk & SOF_SPEAKER_AMP_PRESENT) sof_audio_card_cs42l42.num_links++; + if (sof_cs42l42_quirk & SOF_BT_OFFLOAD_PRESENT) + sof_audio_card_cs42l42.num_links++; =20 dai_links =3D sof_card_dai_links_create(&pdev->dev, ssp_codec, ssp_amp, - dmic_be_num, hdmi_num); + ssp_bt, dmic_be_num, hdmi_num); if (!dai_links) return -ENOMEM; =20 @@ -621,6 +694,17 @@ static const struct platform_device_id board_ids[] =3D= { SOF_CS42L42_SSP_AMP(1)) | SOF_CS42L42_DAILINK(LINK_HP, LINK_DMIC, LINK_HDMI, LINK_SPK, LINK_NON= E), }, + { + .name =3D "adl_mx98360a_cs4242", + .driver_data =3D (kernel_ulong_t)(SOF_CS42L42_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_MAX98360A_SPEAKER_AMP_PRESENT | + SOF_CS42L42_SSP_AMP(1) | + SOF_CS42L42_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_PRESENT | + SOF_CS42L42_SSP_BT(2)) | + SOF_CS42L42_DAILINK(LINK_HP, LINK_DMIC, LINK_HDMI, LINK_SPK, LINK_BT), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/= intel/common/soc-acpi-intel-adl-match.c index 7c8cd00457f81..3f40519250a90 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -384,6 +384,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machin= es[] =3D { .sof_fw_filename =3D "sof-adl.ri", .sof_tplg_filename =3D "sof-adl-cs35l41.tplg", }, + { + .id =3D "10134242", + .drv_name =3D "adl_mx98360a_cs4242", + .machine_quirk =3D snd_soc_acpi_codec_list, + .quirk_data =3D &adl_max98360a_amp, + .sof_fw_filename =3D "sof-adl.ri", + .sof_tplg_filename =3D "sof-adl-max98360a-rt5682.tplg", + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines); --=20 2.25.1