From nobody Sun Sep 22 07:28:59 2024 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 D6F99C433F5 for ; Tue, 1 Mar 2022 07:29:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232992AbiCAHa1 (ORCPT ); Tue, 1 Mar 2022 02:30:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232970AbiCAHaS (ORCPT ); Tue, 1 Mar 2022 02:30:18 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92A817CDD5; Mon, 28 Feb 2022 23:29:37 -0800 (PST) X-UUID: cbf1a133f521477a8df964df6cdc99f0-20220301 X-UUID: cbf1a133f521477a8df964df6cdc99f0-20220301 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 874667113; Tue, 01 Mar 2022 15:29:30 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Tue, 1 Mar 2022 15:29:29 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 1 Mar 2022 15:29:28 +0800 From: Jiaxin Yu To: CC: , , , , , , , , , , Jiaxin Yu , Jiaxin Yu Subject: [PATCH 1/2] ASoC: dt-bindings: mt8192-mt6359: add new compatible for using rt1015p and rt5682 Date: Tue, 1 Mar 2022 15:29:23 +0800 Message-ID: <20220301072924.24814-2-jiaxin.yu@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220301072924.24814-1-jiaxin.yu@mediatek.com> References: <20220301072924.24814-1-jiaxin.yu@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jiaxin Yu Adds new compatible string "mt8192_mt6359_rt1015p_rt5682s" for machines with rt1015p and rt5682s. Signed-off-by: Jiaxin Yu --- .../devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-r= t5682.yaml b/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-r= t5682.yaml index a781e7aaaa38..4b0b0478018a 100644 --- a/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.y= aml +++ b/Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.y= aml @@ -18,6 +18,7 @@ properties: enum: - mediatek,mt8192_mt6359_rt1015_rt5682 - mediatek,mt8192_mt6359_rt1015p_rt5682 + - mediatek,mt8192_mt6359_rt1015p_rt5682s =20 mediatek,platform: $ref: "/schemas/types.yaml#/definitions/phandle" --=20 2.18.0 From nobody Sun Sep 22 07:28:59 2024 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 DB073C433F5 for ; Tue, 1 Mar 2022 07:29:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232982AbiCAHaW (ORCPT ); Tue, 1 Mar 2022 02:30:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232958AbiCAHaR (ORCPT ); Tue, 1 Mar 2022 02:30:17 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 948E1443F2; Mon, 28 Feb 2022 23:29:36 -0800 (PST) X-UUID: cd7626bb2ca04115b1a5fd635e7d9b07-20220301 X-UUID: cd7626bb2ca04115b1a5fd635e7d9b07-20220301 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1427711592; Tue, 01 Mar 2022 15:29:30 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 1 Mar 2022 15:29:30 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 1 Mar 2022 15:29:29 +0800 From: Jiaxin Yu To: CC: , , , , , , , , , , Jiaxin Yu , Jiaxin Yu Subject: [PATCH 2/2] ASoC: mediatek: mt8192: support rt1015p_rt5682s Date: Tue, 1 Mar 2022 15:29:24 +0800 Message-ID: <20220301072924.24814-3-jiaxin.yu@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220301072924.24814-1-jiaxin.yu@mediatek.com> References: <20220301072924.24814-1-jiaxin.yu@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jiaxin Yu Supports machines with rt1015p and rt5682s. Uses new proposed compatible string "mt8192_mt6359_rt1015p_rt5682s". Signed-off-by: Jiaxin Yu --- sound/soc/mediatek/Kconfig | 1 + .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 87 +++++++++++++++++-- 2 files changed, 83 insertions(+), 5 deletions(-) diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index d515613a79da..cacfbab4262d 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -176,6 +176,7 @@ config SND_SOC_MT8192_MT6359_RT1015_RT5682 select SND_SOC_RT1015 select SND_SOC_RT1015P select SND_SOC_RT5682_I2C + select SND_SOC_RT5682S select SND_SOC_DMIC help This adds ASoC driver for Mediatek MT8192 boards diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/soun= d/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c index a606133951b7..17ca6db5cd64 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -31,6 +31,9 @@ #define RT5682_CODEC_DAI "rt5682-aif1" #define RT5682_DEV0_NAME "rt5682.1-001a" =20 +#define RT5682S_CODEC_DAI "rt5682s-aif1" +#define RT5682S_DEV0_NAME "rt5682s.1-001a" + struct mt8192_mt6359_priv { struct snd_soc_jack headset_jack; struct snd_soc_jack hdmi_jack; @@ -632,18 +635,30 @@ SND_SOC_DAILINK_DEFS(i2s7, DAILINK_COMP_ARRAY(COMP_DUMMY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); =20 -SND_SOC_DAILINK_DEFS(i2s8, +SND_SOC_DAILINK_DEFS(i2s8_rt5682, DAILINK_COMP_ARRAY(COMP_CPU("I2S8")), DAILINK_COMP_ARRAY(COMP_CODEC(RT5682_DEV0_NAME, RT5682_CODEC_DAI)), DAILINK_COMP_ARRAY(COMP_EMPTY())); =20 -SND_SOC_DAILINK_DEFS(i2s9, +SND_SOC_DAILINK_DEFS(i2s8_rt5682s, + DAILINK_COMP_ARRAY(COMP_CPU("I2S8")), + DAILINK_COMP_ARRAY(COMP_CODEC(RT5682S_DEV0_NAME, + RT5682S_CODEC_DAI)), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(i2s9_rt5682, DAILINK_COMP_ARRAY(COMP_CPU("I2S9")), DAILINK_COMP_ARRAY(COMP_CODEC(RT5682_DEV0_NAME, RT5682_CODEC_DAI)), DAILINK_COMP_ARRAY(COMP_EMPTY())); =20 +SND_SOC_DAILINK_DEFS(i2s9_rt5682s, + DAILINK_COMP_ARRAY(COMP_CPU("I2S9")), + DAILINK_COMP_ARRAY(COMP_CODEC(RT5682S_DEV0_NAME, + RT5682S_CODEC_DAI)), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + SND_SOC_DAILINK_DEFS(connsys_i2s, DAILINK_COMP_ARRAY(COMP_CPU("CONNSYS_I2S")), DAILINK_COMP_ARRAY(COMP_DUMMY()), @@ -961,7 +976,6 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[= ] =3D { .ignore_suspend =3D 1, .init =3D mt8192_rt5682_init, .be_hw_params_fixup =3D mt8192_i2s_hw_params_fixup, - SND_SOC_DAILINK_REG(i2s8), .ops =3D &mt8192_rt5682_i2s_ops, }, { @@ -970,7 +984,6 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[= ] =3D { .dpcm_playback =3D 1, .ignore_suspend =3D 1, .be_hw_params_fixup =3D mt8192_i2s_hw_params_fixup, - SND_SOC_DAILINK_REG(i2s9), .ops =3D &mt8192_rt5682_i2s_ops, }, { @@ -1100,6 +1113,19 @@ static struct snd_soc_card mt8192_mt6359_rt1015p_rt5= 682_card =3D { .num_dapm_routes =3D ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_routes), }; =20 +static struct snd_soc_card mt8192_mt6359_rt1015p_rt5682s_card =3D { + .name =3D "mt8192_mt6359_rt1015p_rt5682s", + .owner =3D THIS_MODULE, + .dai_link =3D mt8192_mt6359_dai_links, + .num_links =3D ARRAY_SIZE(mt8192_mt6359_dai_links), + .controls =3D mt8192_mt6359_rt1015p_rt5682_controls, + .num_controls =3D ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_controls), + .dapm_widgets =3D mt8192_mt6359_rt1015p_rt5682_widgets, + .num_dapm_widgets =3D ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_widgets), + .dapm_routes =3D mt8192_mt6359_rt1015p_rt5682_routes, + .num_dapm_routes =3D ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_routes), +}; + static int mt8192_mt6359_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card; @@ -1139,7 +1165,8 @@ static int mt8192_mt6359_dev_probe(struct platform_de= vice *pdev) dai_link->platforms =3D i2s3_rt1015_platforms; dai_link->num_platforms =3D ARRAY_SIZE(i2s3_rt1015_platforms); - } else if (card =3D=3D &mt8192_mt6359_rt1015p_rt5682_card) { + } else if (card =3D=3D &mt8192_mt6359_rt1015p_rt5682_card || + card =3D=3D &mt8192_mt6359_rt1015p_rt5682s_card) { dai_link->cpus =3D i2s3_rt1015p_cpus; dai_link->num_cpus =3D ARRAY_SIZE(i2s3_rt1015p_cpus); @@ -1150,6 +1177,52 @@ static int mt8192_mt6359_dev_probe(struct platform_d= evice *pdev) dai_link->num_platforms =3D ARRAY_SIZE(i2s3_rt1015p_platforms); } + } else if (strcmp(dai_link->name, "I2S8") =3D=3D 0) { + if (card =3D=3D &mt8192_mt6359_rt1015_rt5682_card || + card =3D=3D &mt8192_mt6359_rt1015p_rt5682_card) { + dai_link->cpus =3D i2s8_rt5682_cpus; + dai_link->num_cpus =3D + ARRAY_SIZE(i2s8_rt5682_cpus); + dai_link->codecs =3D i2s8_rt5682_codecs; + dai_link->num_codecs =3D + ARRAY_SIZE(i2s8_rt5682_codecs); + dai_link->platforms =3D i2s8_rt5682_platforms; + dai_link->num_platforms =3D + ARRAY_SIZE(i2s8_rt5682_platforms); + } else if (card =3D=3D &mt8192_mt6359_rt1015p_rt5682s_card) { + dai_link->cpus =3D i2s8_rt5682s_cpus; + dai_link->num_cpus =3D + ARRAY_SIZE(i2s8_rt5682s_cpus); + dai_link->codecs =3D i2s8_rt5682s_codecs; + dai_link->num_codecs =3D + ARRAY_SIZE(i2s8_rt5682s_codecs); + dai_link->platforms =3D i2s8_rt5682s_platforms; + dai_link->num_platforms =3D + ARRAY_SIZE(i2s8_rt5682s_platforms); + } + } else if (strcmp(dai_link->name, "I2S9") =3D=3D 0) { + if (card =3D=3D &mt8192_mt6359_rt1015_rt5682_card || + card =3D=3D &mt8192_mt6359_rt1015p_rt5682_card) { + dai_link->cpus =3D i2s9_rt5682_cpus; + dai_link->num_cpus =3D + ARRAY_SIZE(i2s9_rt5682_cpus); + dai_link->codecs =3D i2s9_rt5682_codecs; + dai_link->num_codecs =3D + ARRAY_SIZE(i2s9_rt5682_codecs); + dai_link->platforms =3D i2s9_rt5682_platforms; + dai_link->num_platforms =3D + ARRAY_SIZE(i2s9_rt5682_platforms); + } else if (card =3D=3D &mt8192_mt6359_rt1015p_rt5682s_card) { + dai_link->cpus =3D i2s9_rt5682s_cpus; + dai_link->num_cpus =3D + ARRAY_SIZE(i2s9_rt5682s_cpus); + dai_link->codecs =3D i2s9_rt5682s_codecs; + dai_link->num_codecs =3D + ARRAY_SIZE(i2s9_rt5682s_codecs); + dai_link->platforms =3D i2s9_rt5682s_platforms; + dai_link->num_platforms =3D + ARRAY_SIZE(i2s9_rt5682s_platforms); + } } =20 if (hdmi_codec && strcmp(dai_link->name, "TDM") =3D=3D 0) { @@ -1185,6 +1258,10 @@ static const struct of_device_id mt8192_mt6359_dt_ma= tch[] =3D { .compatible =3D "mediatek,mt8192_mt6359_rt1015p_rt5682", .data =3D &mt8192_mt6359_rt1015p_rt5682_card, }, + { + .compatible =3D "mediatek,mt8192_mt6359_rt1015p_rt5682s", + .data =3D &mt8192_mt6359_rt1015p_rt5682s_card, + }, {} }; #endif --=20 2.18.0