* [PATCH 0/2] ASoC: mediatek: mt8183: ignore TDM DAI link by by default
@ 2021-01-20 9:22 Tzung-Bi Shih
2021-01-20 9:22 ` [PATCH 1/2] ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link " Tzung-Bi Shih
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Tzung-Bi Shih @ 2021-01-20 9:22 UTC (permalink / raw
To: broonie; +Cc: tzungbi, alsa-devel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link by default
2021-01-20 9:22 [PATCH 0/2] ASoC: mediatek: mt8183: ignore TDM DAI link by by default Tzung-Bi Shih
@ 2021-01-20 9:22 ` Tzung-Bi Shih
2021-01-20 9:22 ` [PATCH 2/2] ASoC: mediatek: mt8183-da7219: " Tzung-Bi Shih
2021-01-21 0:05 ` [PATCH 0/2] ASoC: mediatek: mt8183: ignore TDM DAI link by " Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Tzung-Bi Shih @ 2021-01-20 9:22 UTC (permalink / raw
To: broonie; +Cc: tzungbi, alsa-devel
hdmi-codec is an optional property. Ignore to bind TDM DAI link
if the property isn't specified.
Fixes: f2024dc55fcb ("ASoC: mediatek: mt8183: use hdmi-codec")
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
index 0e4892245035..3cf8aeab042c 100644
--- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
@@ -509,6 +509,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),
},
@@ -655,8 +656,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;
--
2.30.0.284.gd98b1dd5eaa7-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ASoC: mediatek: mt8183-da7219: ignore TDM DAI link by default
2021-01-20 9:22 [PATCH 0/2] ASoC: mediatek: mt8183: ignore TDM DAI link by by default Tzung-Bi Shih
2021-01-20 9:22 ` [PATCH 1/2] ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link " Tzung-Bi Shih
@ 2021-01-20 9:22 ` Tzung-Bi Shih
2021-01-21 0:05 ` [PATCH 0/2] ASoC: mediatek: mt8183: ignore TDM DAI link by " Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Tzung-Bi Shih @ 2021-01-20 9:22 UTC (permalink / raw
To: broonie; +Cc: tzungbi, alsa-devel
hdmi-codec is an optional property. Ignore to bind TDM DAI link
if the property isn't specified.
Fixes: 5bdbe9771177 ("ASoC: mediatek: mt8183-da7219: use hdmi-codec")
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index 870cdfd17fff..a4d26a6fc849 100644
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -526,6 +526,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),
},
@@ -748,8 +749,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;
--
2.30.0.284.gd98b1dd5eaa7-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] ASoC: mediatek: mt8183: ignore TDM DAI link by by default
2021-01-20 9:22 [PATCH 0/2] ASoC: mediatek: mt8183: ignore TDM DAI link by by default Tzung-Bi Shih
2021-01-20 9:22 ` [PATCH 1/2] ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link " Tzung-Bi Shih
2021-01-20 9:22 ` [PATCH 2/2] ASoC: mediatek: mt8183-da7219: " Tzung-Bi Shih
@ 2021-01-21 0:05 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2021-01-21 0:05 UTC (permalink / raw
To: Tzung-Bi Shih; +Cc: alsa-devel
On Wed, 20 Jan 2021 17:22:35 +0800, Tzung-Bi Shih wrote:
> 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
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link by default
commit: 5ac154443e686b06242aa49de30a12b74ea9ca98
[2/2] ASoC: mediatek: mt8183-da7219: ignore TDM DAI link by default
commit: 4d36ed8eb0f749c9e781e0d3b041a7adeedcdaa9
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-21 0:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-20 9:22 [PATCH 0/2] ASoC: mediatek: mt8183: ignore TDM DAI link by by default Tzung-Bi Shih
2021-01-20 9:22 ` [PATCH 1/2] ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link " Tzung-Bi Shih
2021-01-20 9:22 ` [PATCH 2/2] ASoC: mediatek: mt8183-da7219: " Tzung-Bi Shih
2021-01-21 0:05 ` [PATCH 0/2] ASoC: mediatek: mt8183: ignore TDM DAI link by " Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.