ASoC: wm5102: Correct OUT2 volume and switch names
Subsystems (3)
PATCH 1/2 ASoC: wm5102: Correct OUT2 volume and switch names
Signed-off-by Charles Keepax <[email protected]>
--- sound/soc/codecs/wm5102.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/wm5102.c +2 -2
@@ -755,7 +755,7 @@ SOC_SINGLE("SPKDAT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_5L,SOC_DOUBLE_R ("HPOUT1 Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_1L ,ARIZONA_DAC_DIGITAL_VOLUME_1R ,ARIZONA_OUT1L_MUTE_SHIFT ,1 ,1 ), -SOC_DOUBLE_R ("OUT2 Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_2L , +SOC_DOUBLE_R ("HPOUT2 Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_2L ,ARIZONA_DAC_DIGITAL_VOLUME_2R ,ARIZONA_OUT2L_MUTE_SHIFT ,1 ,1 ),SOC_SINGLE ("EPOUT Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_3L , ARIZONA_OUT3L_MUTE_SHIFT, 1, 1),
@@ -767,7 +767,7 @@ SOC_DOUBLE_R("SPKDAT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_5L,SOC_DOUBLE_R_TLV ("HPOUT1 Digital Volume" ,ARIZONA_DAC_DIGITAL_VOLUME_1L ,ARIZONA_DAC_DIGITAL_VOLUME_1R ,ARIZONA_OUT1L_VOL_SHIFT ,0xbf ,0 , digital_tlv), -SOC_DOUBLE_R_TLV ("OUT2 Digital Volume" ,ARIZONA_DAC_DIGITAL_VOLUME_2L , +SOC_DOUBLE_R_TLV ("HPOUT2 Digital Volume" ,ARIZONA_DAC_DIGITAL_VOLUME_2L ,ARIZONA_DAC_DIGITAL_VOLUME_2R ,ARIZONA_OUT2L_VOL_SHIFT ,0xbf ,0 , digital_tlv), SOC_SINGLE_TLV("EPOUT Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L,
Signature · 1 line
1.7.2.5
PATCH 2/2 ASoC: wm5110: Correct OUT2/3 volume and switch names
Signed-off-by Charles Keepax <[email protected]>
--- sound/soc/codecs/wm5110.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
sound/soc/codecs/wm5110.c +8 -8
@@ -213,9 +213,9 @@ ARIZONA_MIXER_CONTROLS("SPKDAT2R", ARIZONA_OUT6RMIX_INPUT_1_SOURCE),SOC_SINGLE ("HPOUT1 High Performance Switch" ,ARIZONA_OUTPUT_PATH_CONFIG_1L ,ARIZONA_OUT1_OSR_SHIFT ,1 ,0 ), -SOC_SINGLE ("OUT2 High Performance Switch" ,ARIZONA_OUTPUT_PATH_CONFIG_2L , +SOC_SINGLE ("HPOUT2 High Performance Switch" ,ARIZONA_OUTPUT_PATH_CONFIG_2L ,ARIZONA_OUT2_OSR_SHIFT ,1 ,0 ), -SOC_SINGLE ("OUT3 High Performance Switch" ,ARIZONA_OUTPUT_PATH_CONFIG_3L , +SOC_SINGLE ("HPOUT3 High Performance Switch" ,ARIZONA_OUTPUT_PATH_CONFIG_3L ,ARIZONA_OUT3_OSR_SHIFT ,1 ,0 ),SOC_SINGLE ("Speaker High Performance Switch" ,ARIZONA_OUTPUT_PATH_CONFIG_4L , ARIZONA_OUT4_OSR_SHIFT, 1, 0),
@@ -226,9 +226,9 @@ SOC_SINGLE("SPKDAT2 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_6L,SOC_DOUBLE_R ("HPOUT1 Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_1L ,ARIZONA_DAC_DIGITAL_VOLUME_1R ,ARIZONA_OUT1L_MUTE_SHIFT ,1 ,1 ), -SOC_DOUBLE_R ("OUT2 Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_2L , +SOC_DOUBLE_R ("HPOUT2 Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_2L ,ARIZONA_DAC_DIGITAL_VOLUME_2R ,ARIZONA_OUT2L_MUTE_SHIFT ,1 ,1 ), -SOC_DOUBLE_R ("OUT3 Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_3L , +SOC_DOUBLE_R ("HPOUT3 Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_3L ,ARIZONA_DAC_DIGITAL_VOLUME_3R ,ARIZONA_OUT3L_MUTE_SHIFT ,1 ,1 ),SOC_DOUBLE_R ("Speaker Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_4L , ARIZONA_DAC_DIGITAL_VOLUME_4R, ARIZONA_OUT4L_MUTE_SHIFT, 1, 1),
@@ -240,10 +240,10 @@ SOC_DOUBLE_R("SPKDAT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_6L,SOC_DOUBLE_R_TLV ("HPOUT1 Digital Volume" ,ARIZONA_DAC_DIGITAL_VOLUME_1L ,ARIZONA_DAC_DIGITAL_VOLUME_1R ,ARIZONA_OUT1L_VOL_SHIFT ,0xbf ,0 , digital_tlv), -SOC_DOUBLE_R_TLV ("OUT2 Digital Volume" ,ARIZONA_DAC_DIGITAL_VOLUME_2L , +SOC_DOUBLE_R_TLV ("HPOUT2 Digital Volume" ,ARIZONA_DAC_DIGITAL_VOLUME_2L ,ARIZONA_DAC_DIGITAL_VOLUME_2R ,ARIZONA_OUT2L_VOL_SHIFT ,0xbf ,0 , digital_tlv), -SOC_DOUBLE_R_TLV ("OUT3 Digital Volume" ,ARIZONA_DAC_DIGITAL_VOLUME_3L , +SOC_DOUBLE_R_TLV ("HPOUT3 Digital Volume" ,ARIZONA_DAC_DIGITAL_VOLUME_3L ,ARIZONA_DAC_DIGITAL_VOLUME_3R ,ARIZONA_OUT3L_VOL_SHIFT ,0xbf ,0 , digital_tlv), SOC_DOUBLE_R_TLV("Speaker Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_4L,
@@ -260,11 +260,11 @@ SOC_DOUBLE_R_RANGE_TLV("HPOUT1 Volume", ARIZONA_OUTPUT_PATH_CONFIG_1L, ARIZONA_OUTPUT_PATH_CONFIG_1R, ARIZONA_OUT1L_PGA_VOL_SHIFT, 0x34, 0x40, 0, ana_tlv), -SOC_DOUBLE_R_RANGE_TLV ("OUT2 Volume" ,ARIZONA_OUTPUT_PATH_CONFIG_2L , +SOC_DOUBLE_R_RANGE_TLV ("HPOUT2 Volume" ,ARIZONA_OUTPUT_PATH_CONFIG_2L ,ARIZONA_OUTPUT_PATH_CONFIG_2R ,ARIZONA_OUT2L_PGA_VOL_SHIFT ,0x34 ,0x40 ,0 , ana_tlv), -SOC_DOUBLE_R_RANGE_TLV ("OUT3 Volume" ,ARIZONA_OUTPUT_PATH_CONFIG_3L , +SOC_DOUBLE_R_RANGE_TLV ("HPOUT3 Volume" ,ARIZONA_OUTPUT_PATH_CONFIG_3L ,ARIZONA_OUTPUT_PATH_CONFIG_3R , ARIZONA_OUT3L_PGA_VOL_SHIFT, 0x34, 0x40, 0, ana_tlv),
Signature · 1 line
1.7.2.5
Mark Brown
AppliedQuoted 1 line · Charles Keepax
Signed-off-by Charles Keepax <[email protected]>
Applied, thanks.