December 2021 - Alsa-devel - mailman.alsa-project.org

[PATCH 0/3] More amlogic sound-name-prefix DT fixes
by Alexander Stein 03 Jan '22

03 Jan '22

Following up [1] here are more fix for missing sound-name-prefix properties in the arch/arm64/boot/dts/amlogic/ subtree. [1] https://www.spinics.net/lists/devicetree/msg466125.html Alexander Stein (3): dt-bindings: display: meson-dw-hdmi: add missing sound-name-prefix property ASoC: dt-bindings: spdif-dit: add missing sound-name-prefix property ASoC: dt-bindings: aiu: spdif-dit: add missing sound-name-prefix property .../devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml | 5 +++++ Documentation/devicetree/bindings/sound/amlogic,aiu.yaml | 5 +++++ Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml | 5 +++++ 3 files changed, 15 insertions(+) -- 2.34.1

3 6

[RESEND] Amlogic DPCM audio card(s) speaker placement issue
by Christian Hewitt 03 Jan '22

03 Jan '22

Hello alsa-dev people, I’d like to describe a problem with speaker placement seen with the Amlogic (meson) AIU and AXG drivers when playing multi-channel media. The problem was traced to a failure to get the channel map via snd_pcm_get_chmap() and further analysis showed this failed because the PCM controls are exposed on a different device than the PCM stream. e.g. on LibreTech LePotato with DPCM routing configured for HDMI output, the hw PCM is on the single frontend device 0 but the PCM controls are on device 2: LePotato:~ # aplay -l **** List of PLAYBACK Hardware Devices **** card 0: LIBRETECHCC [LIBRETECH-CC], device 0: fe.dai-link-0 (*) [] Subdevices: 1/1 Subdevice #0: subdevice #0 LePotato:~ # amixer controls numid=19,iface=MIXER,name='PCM Playback Volume' numid=18,iface=MIXER,name='ACODEC Left DAC Sel' numid=7,iface=MIXER,name='ACODEC Mute Ramp Switch' numid=2,iface=MIXER,name='ACODEC Playback Channel Mode' numid=3,iface=MIXER,name='ACODEC Playback Switch' numid=4,iface=MIXER,name='ACODEC Playback Volume' numid=5,iface=MIXER,name='ACODEC Ramp Rate' numid=17,iface=MIXER,name='ACODEC Right DAC Sel' numid=8,iface=MIXER,name='ACODEC Unmute Ramp Switch' numid=6,iface=MIXER,name='ACODEC Volume Ramp Switch' numid=1,iface=MIXER,name='AIU ACODEC I2S Lane Select' numid=16,iface=MIXER,name='AIU ACODEC OUT EN Switch' numid=15,iface=MIXER,name='AIU ACODEC SRC' numid=14,iface=MIXER,name='AIU HDMI CTRL SRC' numid=13,iface=MIXER,name='AIU SPDIF SRC SEL' numid=12,iface=PCM,name='ELD',device=2 numid=11,iface=PCM,name='IEC958 Playback Default',device=2 numid=10,iface=PCM,name='IEC958 Playback Mask',device=2 numid=9,iface=PCM,name='Playback Channel Map',device=2 https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/amlogic/m… or on a Wetek Play 2: WP2:~ # aplay -l **** List of PLAYBACK Hardware Devices **** card 0: WETEKPLAY2 [WETEK-PLAY2], device 0: fe.dai-link-0 (*) [] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: WETEKPLAY2 [WETEK-PLAY2], device 1: fe.dai-link-1 (*) [] Subdevices: 1/1 Subdevice #0: subdevice #0 WP2:~ # amixer controls numid=7,iface=MIXER,name='PCM Playback Volume' numid=6,iface=MIXER,name='AIU HDMI CTRL SRC' numid=5,iface=MIXER,name='AIU SPDIF SRC SEL' numid=4,iface=PCM,name='ELD',device=4 numid=3,iface=PCM,name='IEC958 Playback Default',device=4 numid=2,iface=PCM,name='IEC958 Playback Mask',device=4 numid=1,iface=PCM,name='Playback Channel Map',device=4 https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/amlogic/m… It looks like the PCM controls of the backend hdmi-codec are not routed through the DPCM driver the same way as PCM streams. We discussed that issue with Jerome, the driver author, but it’s not clear which bits we are missing. i.e. if it's something ASoC DPCM should be handling or if some further plumbing in the card driver or userspace is needed? Any hints into the right direction would be highly appreciated! Christian

3 4

[PATCH v4 0/3] Fix Tegra194 HDA regression
by Sameer Pujar 01 Jan '22

01 Jan '22

HDA probe failure is observed on Tegra194 based platforms and this happens due to reset failure. This series fixes the problem by skipping the failing reset and DT bindings are updated accordingly. Changelog ========= v3 -> v4: --------- * Rename SoC data variable in HDA driver patch. * Remove NULL check for compatible match data in HDA driver patch. * Drop "Depends-on" tag from commit message and add "Reviewed-by" tag from Dmitry. * Update binding doc patch as per comment from Rob. v2 -> v3: --------- * Use reset bulk APIs in HDA driver as suggested by Dmitry. v1 -> v2: --------- * Updated HDA driver patch to skip the failing reset instead of skipping resets in general for BPMP devices as per comment from Dmitry. * Used a better strucure name for SoC data as per comment from Thierry. * Dropped 'Fixes' tag in binding doc patch as per comment from Dmitry. Sameer Pujar (3): ALSA: hda/tegra: Fix Tegra194 HDA reset failure dt-bindings: sound: tegra: Add minItems for resets arm64: tegra: Remove non existent Tegra194 reset .../bindings/sound/nvidia,tegra30-hda.yaml | 2 + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 5 +-- sound/pci/hda/hda_tegra.c | 43 +++++++++++++++++----- 3 files changed, 38 insertions(+), 12 deletions(-) -- 2.7.4

2 4

[PATCH 0/1] ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master after reboot from Windows
by Christian Lachner 31 Dec '21

31 Dec '21

This patch addresses an issue where after rebooting from Windows into Linux there would be no audio output. It turns out that the Realtek Audio driver on Windows changes some coeffs which are not being reset/reinitialized when rebooting the machine. As a result, there is no audio output until these coeffs are being reset to their initial state. This patch takes care of that by setting known-good (initial) values to the coeffs. The coeffs were collected via alsa-info, see: broken: https://pastebin.com/4bRBSseH working: https://pastebin.com/WUTufvZB I also created a script which fixes the audio at runtime. #!/bin/sh hda-verb /dev/snd/hwC2D0 0x20 SET_COEF_INDEX 0x1a hda-verb /dev/snd/hwC2D0 0x20 SET_PROC_COEF 0x01c1 hda-verb /dev/snd/hwC2D0 0x20 SET_COEF_INDEX 0x1b hda-verb /dev/snd/hwC2D0 0x20 SET_PROC_COEF 0x0202 hda-verb /dev/snd/hwC2D0 0x20 SET_COEF_INDEX 0x43 hda-verb /dev/snd/hwC2D0 0x20 SET_PROC_COEF 0x3005 hda-verb /dev/snd/hwC2D0 0x20 SET_COEF_INDEX 0x58 hda-verb /dev/snd/hwC2D0 0x20 SET_PROC_COEF 0x8fd6 hda-verb /dev/snd/hwC2D0 0x20 SET_COEF_INDEX 0x5f hda-verb /dev/snd/hwC2D0 0x20 SET_PROC_COEF 0xa3c5 hda-verb /dev/snd/hwC2D0 0x20 SET_COEF_INDEX 0x6a hda-verb /dev/snd/hwC2D0 0x20 SET_PROC_COEF 0x0232 However, obviously, we can and should fix this in the kernel. We initially relied upon alc1220_fixup_clevo_p950() to fix some pins in the connection list. However, it also sets coef 0x7 which does not need to be touched. Furthermore, to prevent mixing device-specific quirks I introduced a new alc1220_fixup_gb_x570() which is heavily based on alc1220_fixup_clevo_p950() but does not set coeff 0x7 and fixes the coeffs that are actually needed instead. This new alc1220_fixup_gb_x570() is believed to also work for other boards, like the Gigabyte X570 Aorus Extreme and the newer Gigabyte Aorus X570S Master. However, as there is no way for me to test these I initially only enable this new behaviour for the mainboard I have which is the Gigabyte X570(non-S) Aorus Master. I tested this patch on the 5.15 branch as well as on master and it is working well for me. Christian Lachner (1): ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master after reboot from Windows sound/pci/hda/patch_realtek.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) -- 2.34.1

2 2

[PATCH 0/2] ASoC: mediatek: mt8195: repair pcmif BE dai
by Trevor Wu 31 Dec '21

31 Dec '21

This series of patches repairs some problems for pcmif BE dai. The unexpected control flow is corrected, and the missing playback support of DPCM is added. Patches are based on broonie tree "for-next" branch. Trevor Wu (2): ASoC: mediatek: mt8195: correct pcmif BE dai control flow ASoC: mediatek: mt8195: add playback support to PCM1_BE dai_link sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 73 ++++++------------- .../mt8195/mt8195-mt6359-rt1011-rt5682.c | 1 + .../mt8195/mt8195-mt6359-rt1019-rt5682.c | 1 + sound/soc/mediatek/mt8195/mt8195-reg.h | 1 + 4 files changed, 24 insertions(+), 52 deletions(-) -- 2.18.0

2 3

Support for TC-Helicon GoXLR Mini
by GitHub issues - edited 31 Dec '21

31 Dec '21

alsa-project/alsa-ucm-conf issue #133 was edited from lm41: Hi, many in the community had noticed that the Configuration for the GoXLR does not work for the GoXLR mini. https://www.tc-helicon.com/product.html?modelCode=P0DI7 Any ideas to get this to work as well? ref: #121 Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/133 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Support for TC-Helicon GoXLR Mini
by GitHub issues - opened 31 Dec '21

31 Dec '21

alsa-project/alsa-ucm-conf issue #133 was opened from lm41: Hi, many in the community had noticed that the Configuration for the GoXLR does not work for the GoXLR mini. https://www.tc-helicon.com/product.html?modelCode=P0DI7 Any ideas to get this to work as well? ref: 121 Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/133 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2] ASoC: mediatek: mt8195: update control for RT5682 series
by Trevor Wu 29 Dec '21

29 Dec '21

Playback pop is observed and the root cause is the reference clock provided by MT8195 is diabled before RT5682 finishes the control flow. To ensure the reference clock supplied to RT5682 is disabled after RT5682 finishes all register controls. We replace BCLK with MCLK for RT5682 reference clock, and makes use of set_bias_level_post to handle MCLK which guarantees MCLK is off after all RT5682 register access. Signed-off-by: Trevor Wu <trevor.wu(a)mediatek.com> --- Changes since v1: 1. Adopt some suggestions from Tzung-bi. 2. mclk phandle is retrieved from afe component instead of dts. --- .../mt8195/mt8195-mt6359-rt1011-rt5682.c | 56 ++++++++++++++- .../mt8195/mt8195-mt6359-rt1019-rt5682.c | 68 ++++++++++++++++--- 2 files changed, 110 insertions(+), 14 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c index ce8dace6527c..8adbd46c4bc4 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c @@ -18,6 +18,7 @@ #include "../../codecs/rt1011.h" #include "../../codecs/rt5682.h" #include "../common/mtk-afe-platform-driver.h" +#include "mt8195-afe-clk.h" #include "mt8195-afe-common.h" #define RT1011_CODEC_DAI "rt1011-aif" @@ -34,6 +35,7 @@ struct mt8195_mt6359_rt1011_rt5682_priv { struct snd_soc_jack headset_jack; struct snd_soc_jack dp_jack; struct snd_soc_jack hdmi_jack; + struct clk *i2so1_mclk; }; static const struct snd_soc_dapm_widget @@ -84,8 +86,8 @@ static int mt8195_rt5682_etdm_hw_params(struct snd_pcm_substream *substream, return ret; } - ret = snd_soc_dai_set_pll(codec_dai, RT5682_PLL1, RT5682_PLL1_S_BCLK1, - rate * 64, rate * 512); + ret = snd_soc_dai_set_pll(codec_dai, RT5682_PLL1, RT5682_PLL1_S_MCLK, + rate * 256, rate * 512); if (ret) { dev_err(card->dev, "failed to set pll\n"); return ret; @@ -98,7 +100,7 @@ static int mt8195_rt5682_etdm_hw_params(struct snd_pcm_substream *substream, return ret; } - return snd_soc_dai_set_sysclk(cpu_dai, 0, rate * 128, + return snd_soc_dai_set_sysclk(cpu_dai, 0, rate * 256, SND_SOC_CLOCK_OUT); } @@ -327,8 +329,14 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) struct mt8195_mt6359_rt1011_rt5682_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_jack *jack = &priv->headset_jack; + struct snd_soc_component *cmpnt_afe = + snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); + struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); + struct mt8195_afe_private *afe_priv = afe->platform_priv; int ret; + priv->i2so1_mclk = afe_priv->clk[MT8195_CLK_TOP_APLL12_DIV2]; + ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | @@ -562,6 +570,47 @@ static const struct snd_soc_ops mt8195_capture_ops = { .startup = mt8195_capture_startup, }; +static int mt8195_set_bias_level_post(struct snd_soc_card *card, + struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level) +{ + struct snd_soc_component *component = dapm->component; + struct mt8195_mt6359_rt1011_rt5682_priv *priv = + snd_soc_card_get_drvdata(card); + int ret; + + /* + * It's required to control mclk directly in the set_bias_level_post + * function for rt5682 and rt5682s codec, or the unexpected pop happens + * at the end of playback. + */ + if (!component || + (strcmp(component->name, RT5682_DEV0_NAME) && + strcmp(component->name, RT5682S_DEV0_NAME))) + return 0; + + switch (level) { + case SND_SOC_BIAS_OFF: + if (!__clk_is_enabled(priv->i2so1_mclk)) + return 0; + + clk_disable_unprepare(priv->i2so1_mclk); + dev_dbg(card->dev, "Disable i2so1 mclk\n"); + break; + case SND_SOC_BIAS_ON: + ret = clk_prepare_enable(priv->i2so1_mclk); + if (ret) { + dev_err(card->dev, "Can't enable i2so1 mclk: %d\n", ret); + return ret; + } + dev_dbg(card->dev, "Enable i2so1 mclk\n"); + break; + default: + break; + } + + return 0; +} + enum { DAI_LINK_DL2_FE, DAI_LINK_DL3_FE, @@ -1037,6 +1086,7 @@ static struct snd_soc_card mt8195_mt6359_rt1011_rt5682_soc_card = { .num_dapm_routes = ARRAY_SIZE(mt8195_mt6359_rt1011_rt5682_routes), .codec_conf = rt1011_amp_conf, .num_configs = ARRAY_SIZE(rt1011_amp_conf), + .set_bias_level_post = mt8195_set_bias_level_post, }; static int mt8195_mt6359_rt1011_rt5682_dev_probe(struct platform_device *pdev) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c index c15c58170e9d..20b351faeaff 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c @@ -19,6 +19,7 @@ #include "../../codecs/mt6359.h" #include "../../codecs/rt5682.h" #include "../common/mtk-afe-platform-driver.h" +#include "mt8195-afe-clk.h" #include "mt8195-afe-common.h" #define RT1019_CODEC_DAI "HiFi" @@ -46,6 +47,7 @@ struct mt8195_mt6359_rt1019_rt5682_priv { struct snd_soc_jack headset_jack; struct snd_soc_jack dp_jack; struct snd_soc_jack hdmi_jack; + struct clk *i2so1_mclk; }; static const struct snd_soc_dapm_widget @@ -92,8 +94,6 @@ static int mt8195_rt5682_etdm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); unsigned int rate = params_rate(params); - unsigned int mclk_fs_ratio = 128; - unsigned int mclk_fs = rate * mclk_fs_ratio; int bitwidth; int ret; @@ -109,25 +109,22 @@ static int mt8195_rt5682_etdm_hw_params(struct snd_pcm_substream *substream, return ret; } - ret = snd_soc_dai_set_pll(codec_dai, RT5682_PLL1, - RT5682_PLL1_S_BCLK1, - params_rate(params) * 64, - params_rate(params) * 512); + ret = snd_soc_dai_set_pll(codec_dai, RT5682_PLL1, RT5682_PLL1_S_MCLK, + rate * 256, rate * 512); if (ret) { dev_err(card->dev, "failed to set pll\n"); return ret; } - ret = snd_soc_dai_set_sysclk(codec_dai, - RT5682_SCLK_S_PLL1, - params_rate(params) * 512, - SND_SOC_CLOCK_IN); + ret = snd_soc_dai_set_sysclk(codec_dai, RT5682_SCLK_S_PLL1, + rate * 512, SND_SOC_CLOCK_IN); if (ret) { dev_err(card->dev, "failed to set sysclk\n"); return ret; } - return snd_soc_dai_set_sysclk(cpu_dai, 0, mclk_fs, SND_SOC_CLOCK_OUT); + return snd_soc_dai_set_sysclk(cpu_dai, 0, rate * 256, + SND_SOC_CLOCK_OUT); } static const struct snd_soc_ops mt8195_rt5682_etdm_ops = { @@ -322,8 +319,14 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) struct mt8195_mt6359_rt1019_rt5682_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_jack *jack = &priv->headset_jack; + struct snd_soc_component *cmpnt_afe = + snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); + struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); + struct mt8195_afe_private *afe_priv = afe->platform_priv; int ret; + priv->i2so1_mclk = afe_priv->clk[MT8195_CLK_TOP_APLL12_DIV2]; + ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | @@ -560,6 +563,48 @@ static const struct snd_soc_ops mt8195_capture_ops = { .startup = mt8195_capture_startup, }; +static int mt8195_set_bias_level_post(struct snd_soc_card *card, + struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level) +{ + struct snd_soc_component *component = dapm->component; + struct mt8195_mt6359_rt1019_rt5682_priv *priv = + snd_soc_card_get_drvdata(card); + int ret; + + /* + * It's required to control mclk directly in the set_bias_level_post + * function for rt5682 and rt5682s codec, or the unexpected pop happens + * at the end of playback. + */ + if (!component || + (strcmp(component->name, RT5682_DEV0_NAME) && + strcmp(component->name, RT5682S_DEV0_NAME))) + return 0; + + + switch (level) { + case SND_SOC_BIAS_OFF: + if (!__clk_is_enabled(priv->i2so1_mclk)) + return 0; + + clk_disable_unprepare(priv->i2so1_mclk); + dev_dbg(card->dev, "Disable i2so1 mclk\n"); + break; + case SND_SOC_BIAS_ON: + ret = clk_prepare_enable(priv->i2so1_mclk); + if (ret) { + dev_err(card->dev, "Can't enable i2so1 mclk: %d\n", ret); + return ret; + } + dev_dbg(card->dev, "Enable i2so1 mclk\n"); + break; + default: + break; + } + + return 0; +} + enum { DAI_LINK_DL2_FE, DAI_LINK_DL3_FE, @@ -1199,6 +1244,7 @@ static struct snd_soc_card mt8195_mt6359_rt1019_rt5682_soc_card = { .num_dapm_widgets = ARRAY_SIZE(mt8195_mt6359_rt1019_rt5682_widgets), .dapm_routes = mt8195_mt6359_rt1019_rt5682_routes, .num_dapm_routes = ARRAY_SIZE(mt8195_mt6359_rt1019_rt5682_routes), + .set_bias_level_post = mt8195_set_bias_level_post, }; static int mt8195_dailink_parse_of(struct snd_soc_card *card, struct device_node *np, -- 2.18.0

3 2

[PATCH] ASoC: samsung: idma: Check of ioremap return value
by Jiasheng Jiang 29 Dec '21

29 Dec '21

Because of the potential failure of the ioremap(), the buf->area could be NULL. Therefore, we need to check it and return -ENOMEM in order to transfer the error. Fixes: f09aecd50f39 ("ASoC: SAMSUNG: Add I2S0 internal dma driver") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- sound/soc/samsung/idma.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c index 66bcc2f97544..c3f1b054e238 100644 --- a/sound/soc/samsung/idma.c +++ b/sound/soc/samsung/idma.c @@ -360,6 +360,8 @@ static int preallocate_idma_buffer(struct snd_pcm *pcm, int stream) buf->addr = idma.lp_tx_addr; buf->bytes = idma_hardware.buffer_bytes_max; buf->area = (unsigned char * __force)ioremap(buf->addr, buf->bytes); + if (!buf->area) + return -ENOMEM; return 0; } -- 2.25.1

3 2

[PATCH] ASoC: mediatek: use of_device_get_match_data()
by Tzung-Bi Shih 29 Dec '21

29 Dec '21

Uses of_device_get_match_data() helper to clean some boilerplate code. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 7 ++----- sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 7 ++----- sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index ca893feab7eb..718505c75418 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -685,7 +685,6 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) struct snd_soc_dai_link *dai_link; struct mt8183_da7219_max98357_priv *priv; struct pinctrl *pinctrl; - const struct of_device_id *match; int ret, i; platform_node = of_parse_phandle(pdev->dev.of_node, @@ -695,11 +694,9 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) return -EINVAL; } - match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev); - if (!match || !match->data) + card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev); + if (!card) return -EINVAL; - - card = (struct snd_soc_card *)match->data; card->dev = &pdev->dev; hdmi_codec = of_parse_phandle(pdev->dev.of_node, diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index 19f8aead775d..b0ec5ebd4f2d 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -637,7 +637,6 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) struct device_node *platform_node, *ec_codec, *hdmi_codec; struct snd_soc_dai_link *dai_link; struct mt8183_mt6358_ts3a227_max98357_priv *priv; - const struct of_device_id *match; int ret, i; platform_node = of_parse_phandle(pdev->dev.of_node, @@ -647,11 +646,9 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) return -EINVAL; } - match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev); - if (!match || !match->data) + card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev); + if (!card) return -EINVAL; - - card = (struct snd_soc_card *)match->data; card->dev = &pdev->dev; ec_codec = of_parse_phandle(pdev->dev.of_node, "mediatek,ec-codec", 0); diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c index 2552f30d8fe4..f7daad1bfe1e 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -1106,7 +1106,6 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev) struct device_node *platform_node, *hdmi_codec; int ret, i; struct snd_soc_dai_link *dai_link; - const struct of_device_id *match; struct mt8192_mt6359_priv *priv; platform_node = of_parse_phandle(pdev->dev.of_node, @@ -1116,11 +1115,9 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev) return -EINVAL; } - match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev); - if (!match || !match->data) + card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev); + if (!card) return -EINVAL; - - card = (struct snd_soc_card *)match->data; card->dev = &pdev->dev; hdmi_codec = of_parse_phandle(pdev->dev.of_node, -- 2.34.1.448.ga2b2bfdf31-goog

2 1