Revert "ASoC: cs48l32: Add support for INx_SWAP_CHAN"

This reverts commit a7accd3.

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

Author: stuhenderson

sound/soc/codecs/cs48l32.c

@@ -423,8 +423,6 @@ SOC_SINGLE_EXT_TLV("IN2R Digital Volume", TACNA_IN2R_CONTROL2,
 SOC_ENUM("Input Ramp Up", tacna_in_vi_ramp),
 SOC_ENUM("Input Ramp Down", tacna_in_vd_ramp),
 
-SOC_ENUM("IN2 Swap Chan", tacna_in2_swap_chan),
-
 TACNA_RATE_ENUM("Ultrasonic 1 Rate", tacna_us_output_rate[0]),
 TACNA_RATE_ENUM("Ultrasonic 2 Rate", tacna_us_output_rate[1]),
 
@@ -748,11 +746,6 @@ SND_SOC_DAPM_MUX("IN1R Mux", SND_SOC_NOPM, 0, 0, &tacna_inmux[1]),
 SND_SOC_DAPM_MUX("IN1L Mode", SND_SOC_NOPM, 0, 0, &cs48l32_dmode_mux[0]),
 SND_SOC_DAPM_MUX("IN1R Mode", SND_SOC_NOPM, 0, 0, &cs48l32_dmode_mux[0]),
 
-SND_SOC_DAPM_MUX("IN1L Swap Chan", SND_SOC_NOPM, 0, 0,
-		 &tacna_in_swap_chan[0]),
-SND_SOC_DAPM_MUX("IN1R Swap Chan", SND_SOC_NOPM, 0, 0,
-		 &tacna_in_swap_chan[0]),
-
 SND_SOC_DAPM_AIF_OUT("ASP1TX1", NULL, 0, TACNA_ASP1_ENABLES1,
 		     TACNA_ASP1_TX1_EN_SHIFT, 0),
 SND_SOC_DAPM_AIF_OUT("ASP1TX2", NULL, 0, TACNA_ASP1_ENABLES1,
@@ -1146,6 +1139,9 @@ static const struct snd_soc_dapm_route cs48l32_dapm_routes[] = {
 	{ "IN1R Mux", "Analog 1", "IN1RP_1" },
 	{ "IN1R Mux", "Analog 2", "IN1RP_2" },
 
+	{ "IN1L PGA", NULL, "IN1L Mode" },
+	{ "IN1R PGA", NULL, "IN1R Mode" },
+
 	{ "IN1L Mode", "Analog", "IN1L Mux" },
 	{ "IN1R Mode", "Analog", "IN1R Mux" },
 
@@ -1184,18 +1180,6 @@ static const struct snd_soc_dapm_route cs48l32_dapm_routes[] = {
 	{ "Ultrasonic Dummy Output", NULL, "Ultrasonic 1 Activity Detect" },
 	{ "Ultrasonic Dummy Output", NULL, "Ultrasonic 2 Activity Detect" },
 
-	{ "IN1L PGA", NULL, "IN1L Swap Chan" },
-	{ "IN1R PGA", NULL, "IN1R Swap Chan" },
-
-	{ "IN1L Swap Chan", "Normal", "IN1L Mode" },
-	{ "IN1R Swap Chan", "Normal", "IN1R Mode" },
-	{ "IN1L Swap Chan", "Swap",   "IN1R Mode" },
-	{ "IN1R Swap Chan", "Swap",   "IN1L Mode" },
-	{ "IN1L Swap Chan", "Left",   "IN1L Mode" },
-	{ "IN1R Swap Chan", "Left",   "IN1L Mode" },
-	{ "IN1L Swap Chan", "Right",  "IN1R Mode" },
-	{ "IN1R Swap Chan", "Right",  "IN1R Mode" },
-
 	TACNA_MIXER_ROUTES("ASP1TX1", "ASP1TX1"),
 	TACNA_MIXER_ROUTES("ASP1TX2", "ASP1TX2"),
 	TACNA_MIXER_ROUTES("ASP1TX3", "ASP1TX3"),

sound/soc/codecs/tacna.c

@@ -689,27 +689,6 @@ const struct snd_kcontrol_new tacna_inmux[] = {
 };
 EXPORT_SYMBOL_GPL(tacna_inmux);
 
-const char * const tacna_in_swap_chan_texts[TACNA_IN_SWAP_CHAN_ENUM_SIZE] = {
-	"Normal", "Swap", "Left", "Right",
-};
-EXPORT_SYMBOL_GPL(tacna_in_swap_chan_texts);
-
-static SOC_ENUM_SINGLE_DECL(tacna_in1_swap_chan,
-			    TACNA_INPUT1_CONTROL1,
-			    TACNA_IN1_CHANNEL_MIX_SHIFT,
-			    tacna_in_swap_chan_texts);
-
-SOC_ENUM_SINGLE_DECL(tacna_in2_swap_chan,
-		     TACNA_INPUT2_CONTROL1,
-		     TACNA_IN2_CHANNEL_MIX_SHIFT,
-		     tacna_in_swap_chan_texts);
-EXPORT_SYMBOL_GPL(tacna_in2_swap_chan);
-
-const struct snd_kcontrol_new tacna_in_swap_chan[] = {
-	SOC_DAPM_ENUM("IN1 Swap Chan", tacna_in1_swap_chan),
-};
-EXPORT_SYMBOL_GPL(tacna_in_swap_chan);
-
 const char * const tacna_dmode_texts[] = {
 	"Analog",
 	"Digital",

sound/soc/codecs/tacna.h

@@ -127,7 +127,6 @@
 #define TACNA_DFC_TYPE_ENUM_SIZE	5
 #define TACNA_DFC_WIDTH_ENUM_SIZE	25
 #define TACNA_DMODE_TEXTS_SIZE		2
-#define TACNA_IN_SWAP_CHAN_ENUM_SIZE	4
 
 #define TACNA_US_FREQ_ENUM_SIZE		4
 
@@ -433,8 +432,6 @@ extern const struct soc_enum tacna_sample_rate_async[];
 extern const struct snd_kcontrol_new tacna_inmux[];
 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_us_freq_texts[TACNA_US_FREQ_ENUM_SIZE];
 extern const char * const tacna_us_in_texts[];