diff options
author | Mark Brown <broonie@kernel.org> | 2018-03-12 17:35:26 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-03-12 17:35:26 +0100 |
commit | 50b123087c48bd979c716eb5d207202dda3f4a46 (patch) | |
tree | 7f3add0a2e902dffcf59f5c9abd3c00c4d28987b /sound/soc/codecs/rt5659.c | |
parent | ASoC: rt5659: rt5659_intel_hd_header_probe_setup() can be static (diff) | |
parent | ASoC: rt5659: fix wrong control register for ADC2 power (diff) | |
download | linux-50b123087c48bd979c716eb5d207202dda3f4a46.tar.xz linux-50b123087c48bd979c716eb5d207202dda3f4a46.zip |
Merge branch 'fix/rt5659' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5659
Diffstat (limited to 'sound/soc/codecs/rt5659.c')
-rw-r--r-- | sound/soc/codecs/rt5659.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c index b7721940b76f..a81e248dfdcd 100644 --- a/sound/soc/codecs/rt5659.c +++ b/sound/soc/codecs/rt5659.c @@ -2555,9 +2555,9 @@ static const struct snd_soc_dapm_widget rt5659_dapm_widgets[] = { RT5659_PWR_ADC_L1_BIT, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("ADC1 R Power", RT5659_PWR_DIG_1, RT5659_PWR_ADC_R1_BIT, 0, NULL, 0), - SND_SOC_DAPM_SUPPLY("ADC2 L Power", RT5659_PWR_DIG_2, + SND_SOC_DAPM_SUPPLY("ADC2 L Power", RT5659_PWR_DIG_1, RT5659_PWR_ADC_L2_BIT, 0, NULL, 0), - SND_SOC_DAPM_SUPPLY("ADC2 R Power", RT5659_PWR_DIG_2, + SND_SOC_DAPM_SUPPLY("ADC2 R Power", RT5659_PWR_DIG_1, RT5659_PWR_ADC_R2_BIT, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("ADC1 clock", SND_SOC_NOPM, 0, 0, set_adc_clk, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), |