Commit 9ce6565f authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm5102: Remove output OSR and PGA volume control 



These are managed automatically in current revisions.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 24a118de

sound/soc/codecs/wm5102.c

+0 −19
Original line number Original line Diff line number Diff line
@@ -719,14 +719,6 @@ ARIZONA_MIXER_CONTROLS("SPKOUTR", ARIZONA_OUT4RMIX_INPUT_1_SOURCE), 
ARIZONA_MIXER_CONTROLS("SPKDAT1L", ARIZONA_OUT5LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SPKDAT1L", ARIZONA_OUT5LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SPKDAT1R", ARIZONA_OUT5RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SPKDAT1R", ARIZONA_OUT5RMIX_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,

	   ARIZONA_OUT2_OSR_SHIFT, 1, 0),

SOC_SINGLE("EPOUT 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),

SOC_SINGLE("SPKDAT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_5L,

SOC_SINGLE("SPKDAT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_5L,

	   ARIZONA_OUT5_OSR_SHIFT, 1, 0),

	   ARIZONA_OUT5_OSR_SHIFT, 1, 0),
@@ -756,17 +748,6 @@ SOC_DOUBLE_R_TLV("SPKDAT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_5L, 
		 ARIZONA_DAC_DIGITAL_VOLUME_5R, ARIZONA_OUT5L_VOL_SHIFT,

		 ARIZONA_DAC_DIGITAL_VOLUME_5R, ARIZONA_OUT5L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),

		 0xbf, 0, digital_tlv),





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,

		       ARIZONA_OUTPUT_PATH_CONFIG_2R,

		       ARIZONA_OUT2L_PGA_VOL_SHIFT,

		       0x34, 0x40, 0, ana_tlv),

SOC_SINGLE_RANGE_TLV("EPOUT Volume", ARIZONA_OUTPUT_PATH_CONFIG_3L,

		     ARIZONA_OUT3L_PGA_VOL_SHIFT, 0x34, 0x40, 0, ana_tlv),



SOC_DOUBLE("SPKDAT1 Switch", ARIZONA_PDM_SPK1_CTRL_1, ARIZONA_SPK1L_MUTE_SHIFT,

SOC_DOUBLE("SPKDAT1 Switch", ARIZONA_PDM_SPK1_CTRL_1, ARIZONA_SPK1L_MUTE_SHIFT,

	   ARIZONA_SPK1R_MUTE_SHIFT, 1, 1),

	   ARIZONA_SPK1R_MUTE_SHIFT, 1, 1),