Unverified Commit d146c7b0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: mediatek: mt8183: ignore TDM DAI link by by default" from... 

Merge series "ASoC: mediatek: mt8183: ignore TDM DAI link by by default" from Tzung-Bi Shih <tzungbi@google.com>:

hdmi-codec is an optional property.  The 2 patches fix DAI link binding
error when the property doesn't exist in DTS.

Tzung-Bi Shih (2):
  ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link by default
  ASoC: mediatek: mt8183-da7219: ignore TDM DAI link by default

 sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c         | 5 ++++-
 sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

--
2.30.0.284.gd98b1dd5eaa7-goog
parents 29be3f02 4d36ed8e

sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c

+4 −1
Original line number Diff line number Diff line
@@ -532,6 +532,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { 
		.dpcm_playback = 1,

		.ignore_suspend = 1,

		.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,

		.ignore = 1,

		.init = mt8183_da7219_max98357_hdmi_init,

		SND_SOC_DAILINK_REG(tdm),

	},
@@ -754,8 +755,10 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) 
			}

		}



		if (hdmi_codec && strcmp(dai_link->name, "TDM") == 0)

		if (hdmi_codec && strcmp(dai_link->name, "TDM") == 0) {

			dai_link->codecs->of_node = hdmi_codec;

			dai_link->ignore = 0;

		}



		if (!dai_link->platforms->name)

			dai_link->platforms->of_node = platform_node;

sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c

+4 −1
Original line number Diff line number Diff line
@@ -515,6 +515,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { 
		.ignore_suspend = 1,

		.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,

		.ops = &mt8183_mt6358_tdm_ops,

		.ignore = 1,

		.init = mt8183_mt6358_ts3a227_max98357_hdmi_init,

		SND_SOC_DAILINK_REG(tdm),

	},
@@ -661,8 +662,10 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) 
						    SND_SOC_DAIFMT_CBM_CFM;

		}



		if (hdmi_codec && strcmp(dai_link->name, "TDM") == 0)

		if (hdmi_codec && strcmp(dai_link->name, "TDM") == 0) {

			dai_link->codecs->of_node = hdmi_codec;

			dai_link->ignore = 0;

		}



		if (!dai_link->platforms->name)

			dai_link->platforms->of_node = platform_node;