projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| f6a5e651 SL |
1 | From b7b902e70c9c0f8a57f87576e86bbd43d4fb301c Mon Sep 17 00:00:00 2001 |
| 2 | From: John Hsu <KCHSU0@nuvoton.com> | |
| 3 | Date: Wed, 13 Mar 2019 16:23:44 +0800 | |
| 4 | Subject: ASoC: nau8810: fix the issue of widget with prefixed name | |
| 5 | ||
| 6 | [ Upstream commit 54d1cf78b0f4ba348a7c7fb8b7d0708d71b6cc8a ] | |
| 7 | ||
| 8 | The driver changes the stream name of DAC and ADC to avoid the issue of | |
| 9 | widget with prefixed name. When the machine adds prefixed name for codec, | |
| 10 | the stream name of DAI may not find the widgets. | |
| 11 | ||
| 12 | Signed-off-by: John Hsu <KCHSU0@nuvoton.com> | |
| 13 | Signed-off-by: Mark Brown <broonie@kernel.org> | |
| 14 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
| 15 | --- | |
| 16 | sound/soc/codecs/nau8810.c | 4 ++-- | |
| 17 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 18 | ||
| 19 | diff --git a/sound/soc/codecs/nau8810.c b/sound/soc/codecs/nau8810.c | |
| 20 | index e45518629968b..2234d0c041657 100644 | |
| 21 | --- a/sound/soc/codecs/nau8810.c | |
| 22 | +++ b/sound/soc/codecs/nau8810.c | |
| 23 | @@ -414,9 +414,9 @@ static const struct snd_soc_dapm_widget nau8810_dapm_widgets[] = { | |
| 24 | SND_SOC_DAPM_MIXER("Mono Mixer", NAU8810_REG_POWER3, | |
| 25 | NAU8810_MOUTMX_EN_SFT, 0, &nau8810_mono_mixer_controls[0], | |
| 26 | ARRAY_SIZE(nau8810_mono_mixer_controls)), | |
| 27 | - SND_SOC_DAPM_DAC("DAC", "HiFi Playback", NAU8810_REG_POWER3, | |
| 28 | + SND_SOC_DAPM_DAC("DAC", "Playback", NAU8810_REG_POWER3, | |
| 29 | NAU8810_DAC_EN_SFT, 0), | |
| 30 | - SND_SOC_DAPM_ADC("ADC", "HiFi Capture", NAU8810_REG_POWER2, | |
| 31 | + SND_SOC_DAPM_ADC("ADC", "Capture", NAU8810_REG_POWER2, | |
| 32 | NAU8810_ADC_EN_SFT, 0), | |
| 33 | SND_SOC_DAPM_PGA("SpkN Out", NAU8810_REG_POWER3, | |
| 34 | NAU8810_NSPK_EN_SFT, 0, NULL, 0), | |
| 35 | -- | |
| 36 | 2.20.1 | |
| 37 |