From nobody Thu Nov 14 10:21:55 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 3160FC433F5 for ; Fri, 8 Apr 2022 06:06:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235145AbiDHGIP (ORCPT ); Fri, 8 Apr 2022 02:08:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235123AbiDHGIK (ORCPT ); Fri, 8 Apr 2022 02:08:10 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1CFE76657; Thu, 7 Apr 2022 23:06:04 -0700 (PDT) X-UUID: bfbcc3fa30bd43429af1d8dd72a6b18a-20220408 X-UUID: bfbcc3fa30bd43429af1d8dd72a6b18a-20220408 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 297700657; Fri, 08 Apr 2022 14:05:58 +0800 Received: from mtkexhb02.mediatek.inc (172.21.101.103) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Fri, 8 Apr 2022 14:05:58 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 8 Apr 2022 14:05:58 +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; Fri, 8 Apr 2022 14:05:57 +0800 From: Jiaxin Yu To: , , , CC: , , , , , , , , , , , Jiaxin Yu , Tzung-Bi Shih Subject: [v10 3/4] ASoC: mediatek: mt8192: refactor for I2S8/I2S9 DAI links of headset Date: Fri, 8 Apr 2022 14:05:51 +0800 Message-ID: <20220408060552.26607-4-jiaxin.yu@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220408060552.26607-1-jiaxin.yu@mediatek.com> References: <20220408060552.26607-1-jiaxin.yu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As part of the refactoring to allow the same machine driver to be used for the rt1015(p) and rt5682(s) codecs on the MT8192 platform, parse the rt5682(s) codec from the headset-codec property in the devicetree and wire it to the I2S8 and I2S9 backends. Signed-off-by: Jiaxin Yu Reviewed-by: Tzung-Bi Shih Reviewed-by: N=C3=ADcolas F. R. A. Prado Tested-by: N=C3=ADcolas F. R. A. Prado Reviewed-by: AngeloGioacchino Del Regno --- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/soun= d/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c index 15711448d259..4a11f687d416 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -28,9 +28,6 @@ #define RT1015_DEV0_NAME "rt1015.1-0028" #define RT1015_DEV1_NAME "rt1015.1-0029" =20 -#define RT5682_CODEC_DAI "rt5682-aif1" -#define RT5682_DEV0_NAME "rt5682.1-001a" - struct mt8192_mt6359_priv { struct snd_soc_jack headset_jack; struct snd_soc_jack hdmi_jack; @@ -626,14 +623,12 @@ SND_SOC_DAILINK_DEFS(i2s7, =20 SND_SOC_DAILINK_DEFS(i2s8, DAILINK_COMP_ARRAY(COMP_CPU("I2S8")), - DAILINK_COMP_ARRAY(COMP_CODEC(RT5682_DEV0_NAME, - RT5682_CODEC_DAI)), + DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); =20 SND_SOC_DAILINK_DEFS(i2s9, DAILINK_COMP_ARRAY(COMP_CPU("I2S9")), - DAILINK_COMP_ARRAY(COMP_CODEC(RT5682_DEV0_NAME, - RT5682_CODEC_DAI)), + DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); =20 SND_SOC_DAILINK_DEFS(connsys_i2s, @@ -1114,7 +1109,7 @@ static int mt8192_mt6359_card_set_be_link(struct snd_= soc_card *card, static int mt8192_mt6359_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card; - struct device_node *platform_node, *hdmi_codec, *speaker_codec; + struct device_node *platform_node, *hdmi_codec, *headset_codec, *speaker_= codec; int ret, i; struct snd_soc_dai_link *dai_link; struct mt8192_mt6359_priv *priv; @@ -1142,6 +1137,13 @@ static int mt8192_mt6359_dev_probe(struct platform_d= evice *pdev) goto err_speaker_codec; } =20 + headset_codec =3D of_get_child_by_name(pdev->dev.of_node, "headset-codec"= ); + if (!headset_codec) { + ret =3D -EINVAL; + dev_err_probe(&pdev->dev, ret, "Property 'headset-codec' missing or inva= lid\n"); + goto err_headset_codec; + } + for_each_card_prelinks(card, i, dai_link) { ret =3D mt8192_mt6359_card_set_be_link(card, dai_link, speaker_codec, "I= 2S3"); if (ret) { @@ -1150,6 +1152,20 @@ static int mt8192_mt6359_dev_probe(struct platform_d= evice *pdev) goto err_probe; } =20 + ret =3D mt8192_mt6359_card_set_be_link(card, dai_link, headset_codec, "I= 2S8"); + if (ret) { + dev_err_probe(&pdev->dev, ret, "%s set headset_codec fail\n", + dai_link->name); + goto err_probe; + } + + ret =3D mt8192_mt6359_card_set_be_link(card, dai_link, headset_codec, "I= 2S9"); + if (ret) { + dev_err_probe(&pdev->dev, ret, "%s set headset_codec fail\n", + dai_link->name); + goto err_probe; + } + if (hdmi_codec && strcmp(dai_link->name, "TDM") =3D=3D 0) { dai_link->codecs->of_node =3D hdmi_codec; dai_link->ignore =3D 0; @@ -1180,6 +1196,8 @@ static int mt8192_mt6359_dev_probe(struct platform_de= vice *pdev) dev_err_probe(&pdev->dev, ret, "%s snd_soc_register_card fail\n", __func= __); =20 err_probe: + of_node_put(headset_codec); +err_headset_codec: of_node_put(speaker_codec); err_speaker_codec: of_node_put(platform_node); --=20 2.25.1