diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-18 15:57:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-18 15:57:27 +0100 |
| commit | 3863293a96c3e2481192b435fe0d85feed1ea47c (patch) | |
| tree | f16957156b96f93470fa64763bac8e474107ac18 /sound/soc/codecs/nau8810.c | |
| parent | ASoC: audio-graph: add graph_parse_mclk_fs() (diff) | |
| parent | ASoC: rt5682: recording has no sound after booting (diff) | |
| download | linux-3863293a96c3e2481192b435fe0d85feed1ea47c.tar.xz linux-3863293a96c3e2481192b435fe0d85feed1ea47c.zip | |
Merge branch 'for-5.1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.2
Diffstat (limited to 'sound/soc/codecs/nau8810.c')
| -rw-r--r-- | sound/soc/codecs/nau8810.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/nau8810.c b/sound/soc/codecs/nau8810.c index 5d300b790f78..125e205e6687 100644 --- a/sound/soc/codecs/nau8810.c +++ b/sound/soc/codecs/nau8810.c @@ -411,9 +411,9 @@ static const struct snd_soc_dapm_widget nau8810_dapm_widgets[] = { SND_SOC_DAPM_MIXER("Mono Mixer", NAU8810_REG_POWER3, NAU8810_MOUTMX_EN_SFT, 0, &nau8810_mono_mixer_controls[0], ARRAY_SIZE(nau8810_mono_mixer_controls)), - SND_SOC_DAPM_DAC("DAC", "HiFi Playback", NAU8810_REG_POWER3, + SND_SOC_DAPM_DAC("DAC", "Playback", NAU8810_REG_POWER3, NAU8810_DAC_EN_SFT, 0), - SND_SOC_DAPM_ADC("ADC", "HiFi Capture", NAU8810_REG_POWER2, + SND_SOC_DAPM_ADC("ADC", "Capture", NAU8810_REG_POWER2, NAU8810_ADC_EN_SFT, 0), SND_SOC_DAPM_PGA("SpkN Out", NAU8810_REG_POWER3, NAU8810_NSPK_EN_SFT, 0, NULL, 0), |