Unverified Commit 50b12308 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/rt5659' of... 

Merge branch 'fix/rt5659' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5659
parents 2fa0b7fd 3795e0c7

sound/soc/codecs/rt5659.c

+2 −2
Original line number Diff line number Diff line
@@ -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),

sound/soc/codecs/rt5659.h

+1 −1
Original line number Diff line number Diff line
@@ -1008,7 +1008,7 @@ 
#define RT5659_PWR_ADC_R1			(0x1 << 3)

#define RT5659_PWR_ADC_R1_BIT			3

#define RT5659_PWR_ADC_L2			(0x1 << 2)

#define RT5659_PWR_ADC_L2_BIT			4

#define RT5659_PWR_ADC_L2_BIT			2

#define RT5659_PWR_ADC_R2			(0x1 << 1)

#define RT5659_PWR_ADC_R2_BIT			1

#define RT5659_PWR_CLS_D			(0x1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE