diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-09-21 18:42:14 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-09-21 18:42:14 +0200 |
| commit | 77ff9e7be0d420bd0555ef51612e8ce241f3e78f (patch) | |
| tree | 4848c1783c895dddc65aa763b28af648421c8cfa /sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | |
| parent | ALSA: hda/cs8409: Setup Dolphin Headset Mic as Phantom Jack (diff) | |
| parent | ASoC: SOF: trace: Omit error print when waking up trace sleepers (diff) | |
| download | linux-77ff9e7be0d420bd0555ef51612e8ce241f3e78f.tar.xz linux-77ff9e7be0d420bd0555ef51612e8ce241f3e78f.zip | |
Merge tag 'asoc-fix-v5.15-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.15
A crop of mostly device specific fixes that have been applied since
the merge window, nothing particularly standout here.
Diffstat (limited to 'sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c')
| -rw-r--r-- | sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c index c97ace7387b4..de09f67c0450 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c @@ -424,8 +424,8 @@ static int mt8195_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) return snd_soc_component_set_jack(cmpnt_codec, &priv->hdmi_jack, NULL); } -static int mt8195_hdmitx_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, - struct snd_pcm_hw_params *params) +static int mt8195_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) { /* fix BE i2s format to 32bit, clean param mask first */ @@ -902,7 +902,7 @@ static struct snd_soc_dai_link mt8195_mt6359_rt1019_rt5682_dai_links[] = { .no_pcm = 1, .dpcm_playback = 1, .ops = &mt8195_dptx_ops, - .be_hw_params_fixup = mt8195_hdmitx_dptx_hw_params_fixup, + .be_hw_params_fixup = mt8195_dptx_hw_params_fixup, SND_SOC_DAILINK_REG(DPTX_BE), }, [DAI_LINK_ETDM1_IN_BE] = { @@ -953,7 +953,6 @@ static struct snd_soc_dai_link mt8195_mt6359_rt1019_rt5682_dai_links[] = { SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .dpcm_playback = 1, - .be_hw_params_fixup = mt8195_hdmitx_dptx_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM3_OUT_BE), }, [DAI_LINK_PCM1_BE] = { |