Revert "ASoC: cs47l96_ao: Add controls for input channel swap"

This reverts commit ca333b7.

Change-Id: I6f0be7d4501b37027edd84a985b3da96fbf94978
Signed-off-by: Qi Zhou <[email protected]>
Signed-off-by: Stuart Henderson <[email protected]>

Author: stuhenderson

sound/soc/codecs/cs47l96-ao.c

@@ -122,21 +122,6 @@ static int cs47l96_ao_in_rate_put(struct snd_kcontrol *kcontrol,
 	return ret;
 }
 
-static SOC_ENUM_SINGLE_DECL(cs47l96_ao_in5_swap_chan,
-			    TACNA_INPUT5AO_CONTROL1,
-			    TACNA_IN5AO_CHANNEL_MIX_SHIFT,
-			    tacna_in_swap_chan_texts);
-
-static SOC_ENUM_SINGLE_DECL(cs47l96_ao_in6_swap_chan,
-			    TACNA_INPUT6AO_CONTROL1,
-			    TACNA_IN6AO_CHANNEL_MIX_SHIFT,
-			    tacna_in_swap_chan_texts);
-
-static SOC_ENUM_SINGLE_DECL(cs47l96_ao_in7_swap_chan,
-			    TACNA_INPUT7AO_CONTROL1,
-			    TACNA_IN7AO_CHANNEL_MIX_SHIFT,
-			    tacna_in_swap_chan_texts);
-
 static SOC_ENUM_SINGLE_DECL(cs47l96_ao_in_vd_ramp,
 			    TACNA_AO_INPUT_VOL_CONTROL,
 			    TACNA_AO_IN_VD_RAMP_SHIFT,
@@ -251,10 +236,6 @@ SOC_SINGLE_EXT_TLV("IN7RAO Digital Volume", TACNA_IN7R_CONTROL2,
 		   snd_soc_get_volsw, tacna_in_put_volsw,
 		   tacna_digital_tlv),
 
-SOC_ENUM("IN5AO Swap Chan", cs47l96_ao_in5_swap_chan),
-SOC_ENUM("IN6AO Swap Chan", cs47l96_ao_in6_swap_chan),
-SOC_ENUM("IN7AO Swap Chan", cs47l96_ao_in7_swap_chan),
-
 SOC_ENUM("AO Input Ramp Up", cs47l96_ao_in_vi_ramp),
 SOC_ENUM("AO Input Ramp Down", cs47l96_ao_in_vd_ramp),
 

sound/soc/codecs/tacna.h

@@ -435,8 +435,6 @@ extern const char * const tacna_dmode_texts[TACNA_DMODE_TEXTS_SIZE];
 extern const struct snd_kcontrol_new tacna_dmode_mux[];
 extern const struct snd_kcontrol_new tacna_in_swap_chan[];
 extern const struct soc_enum tacna_in2_swap_chan;
-extern const char * const
-	tacna_in_swap_chan_texts[TACNA_IN_SWAP_CHAN_ENUM_SIZE];
 
 extern const char * const tacna_us_freq_texts[TACNA_US_FREQ_ENUM_SIZE];
 extern const char * const tacna_us_in_texts[];