From nobody Sun Sep 22 07:42:50 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 B8B18C433F5 for ; Fri, 8 Apr 2022 06:06:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235155AbiDHGIT (ORCPT ); Fri, 8 Apr 2022 02:08:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235125AbiDHGIK (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 283178D6AD; Thu, 7 Apr 2022 23:06:04 -0700 (PDT) X-UUID: 0f9f5a4019804071ac9bddff7d58a880-20220408 X-UUID: 0f9f5a4019804071ac9bddff7d58a880-20220408 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 1791129877; Fri, 08 Apr 2022 14:05:58 +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; Fri, 8 Apr 2022 14:05:56 +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:56 +0800 From: Jiaxin Yu To: , , , CC: , , , , , , , , , , , Jiaxin Yu , Tzung-Bi Shih Subject: [v10 2/4] ASoC: mediatek: mt8192: refactor for I2S3 DAI link of speaker Date: Fri, 8 Apr 2022 14:05:50 +0800 Message-ID: <20220408060552.26607-3-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 rt1015(p) codecs from the speaker-codecs property in the devicetree and wire them to the I2S3 backend, instead of hardcoding the links and selecting through the compatible. 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 | 108 +++++++++--------- 1 file changed, 57 insertions(+), 51 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 ee91569c0911..15711448d259 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -604,17 +604,9 @@ SND_SOC_DAILINK_DEFS(i2s2, DAILINK_COMP_ARRAY(COMP_DUMMY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); =20 -SND_SOC_DAILINK_DEFS(i2s3_rt1015, +SND_SOC_DAILINK_DEFS(i2s3, DAILINK_COMP_ARRAY(COMP_CPU("I2S3")), - DAILINK_COMP_ARRAY(COMP_CODEC(RT1015_DEV0_NAME, - RT1015_CODEC_DAI), - COMP_CODEC(RT1015_DEV1_NAME, - RT1015_CODEC_DAI)), - DAILINK_COMP_ARRAY(COMP_EMPTY())); - -SND_SOC_DAILINK_DEFS(i2s3_rt1015p, - DAILINK_COMP_ARRAY(COMP_CPU("I2S3")), - DAILINK_COMP_ARRAY(COMP_CODEC("rt1015p", "HiFi")), + DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); =20 SND_SOC_DAILINK_DEFS(i2s5, @@ -929,6 +921,7 @@ 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(i2s3), }, { .name =3D "I2S5", @@ -1100,55 +1093,61 @@ static struct snd_soc_card mt8192_mt6359_rt1015p_rt= 5682_card =3D { .num_dapm_routes =3D ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_routes), }; =20 +static int mt8192_mt6359_card_set_be_link(struct snd_soc_card *card, + struct snd_soc_dai_link *link, + struct device_node *node, + char *link_name) +{ + int ret; + + if (node && strcmp(link->name, link_name) =3D=3D 0) { + ret =3D snd_soc_of_get_dai_link_codecs(card->dev, node, link); + if (ret < 0) { + dev_err_probe(card->dev, ret, "get dai link codecs fail\n"); + return ret; + } + } + + return 0; +} + static int mt8192_mt6359_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card; - struct device_node *platform_node, *hdmi_codec; + struct device_node *platform_node, *hdmi_codec, *speaker_codec; int ret, i; struct snd_soc_dai_link *dai_link; struct mt8192_mt6359_priv *priv; =20 - platform_node =3D of_parse_phandle(pdev->dev.of_node, - "mediatek,platform", 0); - if (!platform_node) { - dev_err(&pdev->dev, "Property 'platform' missing or invalid\n"); + card =3D (struct snd_soc_card *)of_device_get_match_data(&pdev->dev); + if (!card) return -EINVAL; - } + card->dev =3D &pdev->dev; =20 - card =3D (struct snd_soc_card *)of_device_get_match_data(&pdev->dev); - if (!card) { + hdmi_codec =3D of_parse_phandle(pdev->dev.of_node, "mediatek,hdmi-codec",= 0); + if (!hdmi_codec) + dev_dbg(&pdev->dev, "The machine has no hdmi-codec\n"); + + platform_node =3D of_parse_phandle(pdev->dev.of_node, "mediatek,platform"= , 0); + if (!platform_node) { ret =3D -EINVAL; - goto put_platform_node; + dev_err_probe(&pdev->dev, ret, "Property 'platform' missing or invalid\n= "); + goto err_platform_node; } - card->dev =3D &pdev->dev; =20 - hdmi_codec =3D of_parse_phandle(pdev->dev.of_node, - "mediatek,hdmi-codec", 0); + speaker_codec =3D of_get_child_by_name(pdev->dev.of_node, "speaker-codecs= "); + if (!speaker_codec) { + ret =3D -EINVAL; + dev_err_probe(&pdev->dev, ret, "Property 'speaker-codecs' missing or inv= alid\n"); + goto err_speaker_codec; + } =20 for_each_card_prelinks(card, i, dai_link) { - if (strcmp(dai_link->name, "I2S3") =3D=3D 0) { - if (card =3D=3D &mt8192_mt6359_rt1015_rt5682_card) { - dai_link->ops =3D &mt8192_rt1015_i2s_ops; - dai_link->cpus =3D i2s3_rt1015_cpus; - dai_link->num_cpus =3D - ARRAY_SIZE(i2s3_rt1015_cpus); - dai_link->codecs =3D i2s3_rt1015_codecs; - dai_link->num_codecs =3D - ARRAY_SIZE(i2s3_rt1015_codecs); - 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) { - dai_link->cpus =3D i2s3_rt1015p_cpus; - dai_link->num_cpus =3D - ARRAY_SIZE(i2s3_rt1015p_cpus); - dai_link->codecs =3D i2s3_rt1015p_codecs; - dai_link->num_codecs =3D - ARRAY_SIZE(i2s3_rt1015p_codecs); - dai_link->platforms =3D i2s3_rt1015p_platforms; - dai_link->num_platforms =3D - ARRAY_SIZE(i2s3_rt1015p_platforms); - } + ret =3D mt8192_mt6359_card_set_be_link(card, dai_link, speaker_codec, "I= 2S3"); + if (ret) { + dev_err_probe(&pdev->dev, ret, "%s set speaker_codec fail\n", + dai_link->name); + goto err_probe; } =20 if (hdmi_codec && strcmp(dai_link->name, "TDM") =3D=3D 0) { @@ -1156,6 +1155,9 @@ static int mt8192_mt6359_dev_probe(struct platform_de= vice *pdev) dai_link->ignore =3D 0; } =20 + if (strcmp(dai_link->codecs[0].dai_name, RT1015_CODEC_DAI) =3D=3D 0) + dai_link->ops =3D &mt8192_rt1015_i2s_ops; + if (!dai_link->platforms->name) dai_link->platforms->of_node =3D platform_node; } @@ -1163,22 +1165,26 @@ static int mt8192_mt6359_dev_probe(struct platform_= device *pdev) priv =3D devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); if (!priv) { ret =3D -ENOMEM; - goto put_hdmi_codec; + goto err_probe; } snd_soc_card_set_drvdata(card, priv); =20 ret =3D mt8192_afe_gpio_init(&pdev->dev); if (ret) { - dev_err(&pdev->dev, "init gpio error %d\n", ret); - goto put_hdmi_codec; + dev_err_probe(&pdev->dev, ret, "%s init gpio error\n", __func__); + goto err_probe; } =20 ret =3D devm_snd_soc_register_card(&pdev->dev, card); + if (ret) + dev_err_probe(&pdev->dev, ret, "%s snd_soc_register_card fail\n", __func= __); =20 -put_hdmi_codec: - of_node_put(hdmi_codec); -put_platform_node: +err_probe: + of_node_put(speaker_codec); +err_speaker_codec: of_node_put(platform_node); +err_platform_node: + of_node_put(hdmi_codec); return ret; } =20 --=20 2.25.1