On Fri, 2022-03-11 at 10:15 +0800, Jiaxin Yu wrote:
> Supports machines with rt1015p and rt5682s. Uses new proposed
> compatible
> string "mt8192_mt6359_rt1015p_rt5682s". Using define to simplifies
> card
> name and compatible name, and uses the
> snd_soc_of_get_dai_link_codecs()
> to complete the configuration of dai_link's codecs.
>
> Signed-off-by: Jiaxin Yu <jiaxin.yu@xxxxxxxxxxxx>
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> ---
> sound/soc/mediatek/Kconfig | 1 +
> .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 204 +++++++++++-----
> --
> 2 files changed, 128 insertions(+), 77 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/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
> index ee91569c0911..219b38ee25ae 100644
> --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
> +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
> @@ -28,8 +28,13 @@
> #define RT1015_DEV0_NAME "rt1015.1-0028"
> #define RT1015_DEV1_NAME "rt1015.1-0029"
>
> -#define RT5682_CODEC_DAI "rt5682-aif1"
> -#define RT5682_DEV0_NAME "rt5682.1-001a"
> +#define RT1015_RT5682_CARD_NAME "mt8192_mt6359_rt1015_rt5682"
> +#define RT1015P_RT5682_CARD_NAME "mt8192_mt6359_rt1015p_rt5682"
> +#define RT1015P_RT5682S_CARD_NAME "mt8192_mt6359_rt1015p_rt5682s"
> +
> +#define RT1015_RT5682_OF_NAME "mediatek,mt8192_mt6359_rt1015_rt5682"
> +#define RT1015P_RT5682_OF_NAME
> "mediatek,mt8192_mt6359_rt1015p_rt5682"
> +#define RT1015P_RT5682S_OF_NAME
> "mediatek,mt8192_mt6359_rt1015p_rt5682s"
>
> struct mt8192_mt6359_priv {
> struct snd_soc_jack headset_jack;
> @@ -71,8 +76,8 @@ static int mt8192_rt1015_i2s_hw_params(struct
> snd_pcm_substream *substream,
> return snd_soc_dai_set_sysclk(cpu_dai, 0, mclk_fs,
> SND_SOC_CLOCK_OUT);
> }
>
> -static int mt8192_rt5682_i2s_hw_params(struct snd_pcm_substream
> *substream,
> - struct snd_pcm_hw_params
> *params)
> +static int mt8192_rt5682x_i2s_hw_params(struct snd_pcm_substream
> *substream,
> + struct snd_pcm_hw_params
> *params)
> {
> struct snd_soc_pcm_runtime *rtd =
> asoc_substream_to_rtd(substream);
> struct snd_soc_card *card = rtd->card;
> @@ -121,8 +126,8 @@ static const struct snd_soc_ops
> mt8192_rt1015_i2s_ops = {
> .hw_params = mt8192_rt1015_i2s_hw_params,
> };
>
> -static const struct snd_soc_ops mt8192_rt5682_i2s_ops = {
> - .hw_params = mt8192_rt5682_i2s_hw_params,
> +static const struct snd_soc_ops mt8192_rt5682x_i2s_ops = {
> + .hw_params = mt8192_rt5682x_i2s_hw_params,
> };
>
> static int mt8192_mt6359_mtkaif_calibration(struct
> snd_soc_pcm_runtime *rtd)
> @@ -604,17 +609,9 @@ SND_SOC_DAILINK_DEFS(i2s2,
> DAILINK_COMP_ARRAY(COMP_DUMMY()),
> DAILINK_COMP_ARRAY(COMP_EMPTY()));
>
> -SND_SOC_DAILINK_DEFS(i2s3_rt1015,
> - 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,
> +SND_SOC_DAILINK_DEFS(i2s3,
> DAILINK_COMP_ARRAY(COMP_CPU("I2S3")),
> - DAILINK_COMP_ARRAY(COMP_CODEC("rt1015p", "HiFi")),
> + DAILINK_COMP_ARRAY(COMP_EMPTY()),
> DAILINK_COMP_ARRAY(COMP_EMPTY()));
>
> SND_SOC_DAILINK_DEFS(i2s5,
> @@ -634,14 +631,12 @@ SND_SOC_DAILINK_DEFS(i2s7,
>
> 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()));
>
> 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()));
>
> SND_SOC_DAILINK_DEFS(connsys_i2s,
> @@ -929,6 +924,7 @@ static struct snd_soc_dai_link
> mt8192_mt6359_dai_links[] = {
> .dpcm_playback = 1,
> .ignore_suspend = 1,
> .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
> + SND_SOC_DAILINK_REG(i2s3),
> },
> {
> .name = "I2S5",
> @@ -962,7 +958,7 @@ static struct snd_soc_dai_link
> mt8192_mt6359_dai_links[] = {
> .init = mt8192_rt5682_init,
> .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
> SND_SOC_DAILINK_REG(i2s8),
> - .ops = &mt8192_rt5682_i2s_ops,
> + .ops = &mt8192_rt5682x_i2s_ops,
> },
> {
> .name = "I2S9",
> @@ -971,7 +967,7 @@ static struct snd_soc_dai_link
> mt8192_mt6359_dai_links[] = {
> .ignore_suspend = 1,
> .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
> SND_SOC_DAILINK_REG(i2s9),
> - .ops = &mt8192_rt5682_i2s_ops,
> + .ops = &mt8192_rt5682x_i2s_ops,
> },
> {
> .name = "CONNSYS_I2S",
> @@ -1051,7 +1047,7 @@ static struct snd_soc_codec_conf
> rt1015_amp_conf[] = {
> };
>
> static struct snd_soc_card mt8192_mt6359_rt1015_rt5682_card = {
> - .name = "mt8192_mt6359_rt1015_rt5682",
> + .name = RT1015_RT5682_CARD_NAME,
> .owner = THIS_MODULE,
> .dai_link = mt8192_mt6359_dai_links,
> .num_links = ARRAY_SIZE(mt8192_mt6359_dai_links),
> @@ -1066,13 +1062,13 @@ static struct snd_soc_card
> mt8192_mt6359_rt1015_rt5682_card = {
> };
>
> static const struct snd_soc_dapm_widget
> -mt8192_mt6359_rt1015p_rt5682_widgets[] = {
> +mt8192_mt6359_rt1015p_rt5682x_widgets[] = {
> SND_SOC_DAPM_SPK("Speakers", NULL),
> SND_SOC_DAPM_HP("Headphone Jack", NULL),
> SND_SOC_DAPM_MIC("Headset Mic", NULL),
> };
>
> -static const struct snd_soc_dapm_route
> mt8192_mt6359_rt1015p_rt5682_routes[] = {
> +static const struct snd_soc_dapm_route
> mt8192_mt6359_rt1015p_rt5682x_routes[] = {
> /* speaker */
> { "Speakers", NULL, "Speaker" },
> /* headset */
> @@ -1081,74 +1077,112 @@ static const struct snd_soc_dapm_route
> mt8192_mt6359_rt1015p_rt5682_routes[] = {
> { "IN1P", NULL, "Headset Mic" },
> };
>
> -static const struct snd_kcontrol_new
> mt8192_mt6359_rt1015p_rt5682_controls[] = {
> +static const struct snd_kcontrol_new
> mt8192_mt6359_rt1015p_rt5682x_controls[] = {
> SOC_DAPM_PIN_SWITCH("Speakers"),
> SOC_DAPM_PIN_SWITCH("Headphone Jack"),
> SOC_DAPM_PIN_SWITCH("Headset Mic"),
> };
>
> -static struct snd_soc_card mt8192_mt6359_rt1015p_rt5682_card = {
> - .name = "mt8192_mt6359_rt1015p_rt5682",
> +static struct snd_soc_card mt8192_mt6359_rt1015p_rt5682x_card = {
> .owner = THIS_MODULE,
> .dai_link = mt8192_mt6359_dai_links,
> .num_links = ARRAY_SIZE(mt8192_mt6359_dai_links),
> - .controls = mt8192_mt6359_rt1015p_rt5682_controls,
> - .num_controls =
> ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_controls),
> - .dapm_widgets = mt8192_mt6359_rt1015p_rt5682_widgets,
> - .num_dapm_widgets =
> ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_widgets),
> - .dapm_routes = mt8192_mt6359_rt1015p_rt5682_routes,
> - .num_dapm_routes =
> ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_routes),
> + .controls = mt8192_mt6359_rt1015p_rt5682x_controls,
> + .num_controls =
> ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682x_controls),
> + .dapm_widgets = mt8192_mt6359_rt1015p_rt5682x_widgets,
> + .num_dapm_widgets =
> ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682x_widgets),
> + .dapm_routes = mt8192_mt6359_rt1015p_rt5682x_routes,
> + .num_dapm_routes =
> ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682x_routes),
> };
>
> +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) == 0) {
> + ret = snd_soc_of_get_dai_link_codecs(card->dev, node,
> link);
> + if (ret < 0) {
> + dev_err(card->dev, "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, *headset_codec,
> *speaker_codec;
> int ret, i;
> struct snd_soc_dai_link *dai_link;
> struct mt8192_mt6359_priv *priv;
> + struct device *dev;
>
> - platform_node = of_parse_phandle(pdev->dev.of_node,
> - "mediatek,platform", 0);
> - if (!platform_node) {
> - dev_err(&pdev->dev, "Property 'platform' missing or
> invalid\n");
> + card = (struct snd_soc_card *)of_device_get_match_data(&pdev-
> >dev);
> + if (!card)
> return -EINVAL;
> + card->dev = &pdev->dev;
> + dev = &pdev->dev;
> +
> + if (of_device_is_compatible(dev->of_node,
> RT1015P_RT5682_OF_NAME))
> + card->name = RT1015P_RT5682_CARD_NAME;
> + else if (of_device_is_compatible(dev->of_node,
> RT1015P_RT5682S_OF_NAME))
> + card->name = RT1015P_RT5682S_CARD_NAME;
> + else
> + dev_dbg(dev, "No need to set card name\n");
> +
> + platform_node = of_parse_phandle(dev->of_node,
> "mediatek,platform", 0);
> + if (!platform_node) {
> + ret = -EINVAL;
> + dev_err_probe(dev, ret, "Property 'platform' missing or
> invalid\n");
> + goto err_platform_node;
> }
>
> - card = (struct snd_soc_card *)of_device_get_match_data(&pdev-
> >dev);
> - if (!card) {
> + hdmi_codec = of_parse_phandle(dev->of_node, "mediatek,hdmi-
> codec", 0);
> + if (!hdmi_codec) {
> ret = -EINVAL;
> - goto put_platform_node;
> + dev_err_probe(dev, ret, "Property 'hdmi-codec' missing
> or invalid\n");
> + goto err_hdmi_codec;
> }
> - card->dev = &pdev->dev;
>
> - hdmi_codec = of_parse_phandle(pdev->dev.of_node,
> - "mediatek,hdmi-codec", 0);
> + speaker_codec = of_get_child_by_name(dev->of_node,
> "mediatek,speaker-codec");
> + if (!speaker_codec) {
> + ret = -EINVAL;
> + dev_err_probe(dev, ret, "Property 'speaker_codec'
> missing or invalid\n");
> + goto err_speaker_codec;
> + }
> +
> + headset_codec = of_get_child_by_name(dev->of_node,
> "mediatek,headset-codec");
> + if (!headset_codec) {
> + ret = -EINVAL;
> + dev_err_probe(dev, ret, "Property 'headset_codec'
> missing or invalid\n");
> + goto err_headset_codec;
> + }
>
> for_each_card_prelinks(card, i, dai_link) {
> - if (strcmp(dai_link->name, "I2S3") == 0) {
> - if (card == &mt8192_mt6359_rt1015_rt5682_card)
> {
> - dai_link->ops = &mt8192_rt1015_i2s_ops;
> - dai_link->cpus = i2s3_rt1015_cpus;
> - dai_link->num_cpus =
> - ARRAY_SIZE(i2s3_rt1015_cpus);
> - dai_link->codecs = i2s3_rt1015_codecs;
> - dai_link->num_codecs =
> - ARRAY_SIZE(i2s3_rt1015_codecs);
> - dai_link->platforms =
> i2s3_rt1015_platforms;
> - dai_link->num_platforms =
> - ARRAY_SIZE(i2s3_rt1015_platform
> s);
> - } else if (card ==
> &mt8192_mt6359_rt1015p_rt5682_card) {
> - dai_link->cpus = i2s3_rt1015p_cpus;
> - dai_link->num_cpus =
> - ARRAY_SIZE(i2s3_rt1015p_cpus);
> - dai_link->codecs = i2s3_rt1015p_codecs;
> - dai_link->num_codecs =
> - ARRAY_SIZE(i2s3_rt1015p_codecs)
> ;
> - dai_link->platforms =
> i2s3_rt1015p_platforms;
> - dai_link->num_platforms =
> - ARRAY_SIZE(i2s3_rt1015p_platfor
> ms);
> - }
> + ret = mt8192_mt6359_card_set_be_link(card, dai_link,
> speaker_codec, "I2S3");
> + if (ret) {
> + dev_err_probe(&pdev->dev, ret, "%s set
> speaker_codec fail\n",
> + dai_link->name);
> + goto err_probe;
> + }
> +
> + ret = mt8192_mt6359_card_set_be_link(card, dai_link,
> headset_codec, "I2S8");
> + if (ret) {
> + dev_err_probe(&pdev->dev, ret, "%s set
> headset_codec fail\n",
> + dai_link->name);
> + goto err_probe;
> + }
> +
> + ret = mt8192_mt6359_card_set_be_link(card, dai_link,
> headset_codec, "I2S9");
> + if (ret) {
> + dev_err_probe(&pdev->dev, ret, "%s set %s
> headset_codec fail\n",
> + dai_link->name);
I'm terribly sorry, this will cause a build error, but my compiler
will not show it. I will fix it and send again.
> + goto err_probe;
> }
>
> if (hdmi_codec && strcmp(dai_link->name, "TDM") == 0) {
> @@ -1156,6 +1190,9 @@ static int mt8192_mt6359_dev_probe(struct
> platform_device *pdev)
> dai_link->ignore = 0;
> }
>
> + if (strcmp(dai_link->codecs[0].dai_name,
> RT1015_CODEC_DAI) == 0)
> + dai_link->ops = &mt8192_rt1015_i2s_ops;
> +
> if (!dai_link->platforms->name)
> dai_link->platforms->of_node = platform_node;
> }
> @@ -1163,34 +1200,47 @@ static int mt8192_mt6359_dev_probe(struct
> platform_device *pdev)
> priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
> if (!priv) {
> ret = -ENOMEM;
> - goto put_hdmi_codec;
> + goto err_probe;
> }
> snd_soc_card_set_drvdata(card, priv);
>
> ret = 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;
> }
>
> ret = devm_snd_soc_register_card(&pdev->dev, card);
> -
> -put_hdmi_codec:
> + if (ret)
> + dev_err_probe(&pdev->dev, ret,
> + "%s snd_soc_register_card fail\n",
> __func__);
> +
> +err_probe:
> + of_node_put(headset_codec);
> +err_headset_codec:
> + of_node_put(speaker_codec);
> +err_speaker_codec:
> of_node_put(hdmi_codec);
> -put_platform_node:
> +err_hdmi_codec:
> of_node_put(platform_node);
> +err_platform_node:
> +
> return ret;
> }
>
> #ifdef CONFIG_OF
> static const struct of_device_id mt8192_mt6359_dt_match[] = {
> {
> - .compatible = "mediatek,mt8192_mt6359_rt1015_rt5682",
> + .compatible = RT1015_RT5682_OF_NAME,
> .data = &mt8192_mt6359_rt1015_rt5682_card,
> },
> {
> - .compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682",
> - .data = &mt8192_mt6359_rt1015p_rt5682_card,
> + .compatible = RT1015P_RT5682_OF_NAME,
> + .data = &mt8192_mt6359_rt1015p_rt5682x_card,
> + },
> + {
> + .compatible = RT1015P_RT5682S_OF_NAME,
> + .data = &mt8192_mt6359_rt1015p_rt5682x_card,
> },
> {}
> };
> --
> 2.18.0
>
