diff options
| author | Mark Brown <broonie@kernel.org> | 2018-03-12 12:35:26 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-03-12 12:35:26 -0400 |
| commit | 50b123087c48bd979c716eb5d207202dda3f4a46 (patch) | |
| tree | 7f3add0a2e902dffcf59f5c9abd3c00c4d28987b | |
| parent | 2fa0b7fdf8bd16b6cdda8516793989511c9322ed (diff) | |
| parent | 3795e0c7d5c8b81d4ae32129b860aaa169945ce3 (diff) | |
Merge branch 'fix/rt5659' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5659
| -rw-r--r-- | sound/soc/codecs/rt5659.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/rt5659.h | 2 |
2 files changed, 3 insertions, 3 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[] = { | |||
| 2555 | RT5659_PWR_ADC_L1_BIT, 0, NULL, 0), | 2555 | RT5659_PWR_ADC_L1_BIT, 0, NULL, 0), |
| 2556 | SND_SOC_DAPM_SUPPLY("ADC1 R Power", RT5659_PWR_DIG_1, | 2556 | SND_SOC_DAPM_SUPPLY("ADC1 R Power", RT5659_PWR_DIG_1, |
| 2557 | RT5659_PWR_ADC_R1_BIT, 0, NULL, 0), | 2557 | RT5659_PWR_ADC_R1_BIT, 0, NULL, 0), |
| 2558 | SND_SOC_DAPM_SUPPLY("ADC2 L Power", RT5659_PWR_DIG_2, | 2558 | SND_SOC_DAPM_SUPPLY("ADC2 L Power", RT5659_PWR_DIG_1, |
| 2559 | RT5659_PWR_ADC_L2_BIT, 0, NULL, 0), | 2559 | RT5659_PWR_ADC_L2_BIT, 0, NULL, 0), |
| 2560 | SND_SOC_DAPM_SUPPLY("ADC2 R Power", RT5659_PWR_DIG_2, | 2560 | SND_SOC_DAPM_SUPPLY("ADC2 R Power", RT5659_PWR_DIG_1, |
| 2561 | RT5659_PWR_ADC_R2_BIT, 0, NULL, 0), | 2561 | RT5659_PWR_ADC_R2_BIT, 0, NULL, 0), |
| 2562 | SND_SOC_DAPM_SUPPLY("ADC1 clock", SND_SOC_NOPM, 0, 0, set_adc_clk, | 2562 | SND_SOC_DAPM_SUPPLY("ADC1 clock", SND_SOC_NOPM, 0, 0, set_adc_clk, |
| 2563 | SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), | 2563 | SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), |
diff --git a/sound/soc/codecs/rt5659.h b/sound/soc/codecs/rt5659.h index 73969ef5029f..3b51c8a46e6e 100644 --- a/sound/soc/codecs/rt5659.h +++ b/sound/soc/codecs/rt5659.h | |||
| @@ -1008,7 +1008,7 @@ | |||
| 1008 | #define RT5659_PWR_ADC_R1 (0x1 << 3) | 1008 | #define RT5659_PWR_ADC_R1 (0x1 << 3) |
| 1009 | #define RT5659_PWR_ADC_R1_BIT 3 | 1009 | #define RT5659_PWR_ADC_R1_BIT 3 |
| 1010 | #define RT5659_PWR_ADC_L2 (0x1 << 2) | 1010 | #define RT5659_PWR_ADC_L2 (0x1 << 2) |
| 1011 | #define RT5659_PWR_ADC_L2_BIT 4 | 1011 | #define RT5659_PWR_ADC_L2_BIT 2 |
| 1012 | #define RT5659_PWR_ADC_R2 (0x1 << 1) | 1012 | #define RT5659_PWR_ADC_R2 (0x1 << 1) |
| 1013 | #define RT5659_PWR_ADC_R2_BIT 1 | 1013 | #define RT5659_PWR_ADC_R2_BIT 1 |
| 1014 | #define RT5659_PWR_CLS_D (0x1) | 1014 | #define RT5659_PWR_CLS_D (0x1) |