Skip to content

Commit 6bb24b7

Browse files
stuhendersonstuhenderson
committed
Revert "ASoC: cs47l96: Add controls for input channel swap"
This reverts commit cf7631f. Change-Id: I945a86ca1fd5e6ba279559744b832d1f95b536ef Signed-off-by: Qi Zhou <[email protected]> Signed-off-by: Stuart Henderson <[email protected]>
1 parent ef67629 commit 6bb24b7

File tree

4 files changed

+17
-56
lines changed

4 files changed

+17
-56
lines changed

‎sound/soc/codecs/cs47l96.c‎

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -669,9 +669,6 @@ SOC_SINGLE_EXT_TLV("IN4R Digital Volume", TACNA_IN4R_CONTROL2,
669669
snd_soc_get_volsw, tacna_in_put_volsw,
670670
tacna_digital_tlv),
671671

672-
SOC_ENUM("IN3 Swap Chan", tacna_in_swap_chan_ctrl[2]),
673-
SOC_ENUM("IN4 Swap Chan", tacna_in_swap_chan_ctrl[3]),
674-
675672
SOC_ENUM("Input Ramp Up", tacna_in_vi_ramp),
676673
SOC_ENUM("Input Ramp Down", tacna_in_vd_ramp),
677674

@@ -1354,16 +1351,6 @@ SND_SOC_DAPM_MUX("IN1R Mode", SND_SOC_NOPM, 0, 0, &tacna_dmode_mux[0]),
13541351
SND_SOC_DAPM_MUX("IN2L Mode", SND_SOC_NOPM, 0, 0, &tacna_dmode_mux[1]),
13551352
SND_SOC_DAPM_MUX("IN2R Mode", SND_SOC_NOPM, 0, 0, &tacna_dmode_mux[1]),
13561353

1357-
SND_SOC_DAPM_MUX("IN1L Swap Chan", SND_SOC_NOPM, 0, 0,
1358-
&tacna_in_swap_chan[0]),
1359-
SND_SOC_DAPM_MUX("IN1R Swap Chan", SND_SOC_NOPM, 0, 0,
1360-
&tacna_in_swap_chan[0]),
1361-
1362-
SND_SOC_DAPM_MUX("IN2L Swap Chan", SND_SOC_NOPM, 0, 0,
1363-
&tacna_in_swap_chan[1]),
1364-
SND_SOC_DAPM_MUX("IN2R Swap Chan", SND_SOC_NOPM, 0, 0,
1365-
&tacna_in_swap_chan[1]),
1366-
13671354
SND_SOC_DAPM_AIF_OUT("ASP1TX1", NULL, 0, TACNA_ASP1_ENABLES1,
13681355
TACNA_ASP1_TX1_EN_SHIFT, 0),
13691356
SND_SOC_DAPM_AIF_OUT("ASP1TX2", NULL, 0, TACNA_ASP1_ENABLES1,
@@ -2160,45 +2147,29 @@ static const struct snd_soc_dapm_route cs47l96_dapm_routes[] = {
21602147
{ "IN1L Mux", NULL, "MICD_COMP_FRC" },
21612148
{ "IN1R Mux", NULL, "MICD_COMP_FRC" },
21622149

2150+
{ "IN1L PGA", NULL, "IN1L Mode" },
2151+
{ "IN1R PGA", NULL, "IN1R Mode" },
21632152
{ "IN1L Mode", "Analog", "IN1L Mux" },
21642153
{ "IN1R Mode", "Analog", "IN1R Mux" },
21652154
{ "IN1L Mode", "Digital", "IN1_PDMCLK" },
21662155
{ "IN1L Mode", "Digital", "IN1_PDMDATA" },
21672156
{ "IN1R Mode", "Digital", "IN1_PDMCLK" },
21682157
{ "IN1R Mode", "Digital", "IN1_PDMDATA" },
2169-
{ "IN1L Swap Chan", "Normal", "IN1L Mode" },
2170-
{ "IN1R Swap Chan", "Normal", "IN1R Mode" },
2171-
{ "IN1L Swap Chan", "Swap", "IN1R Mode" },
2172-
{ "IN1R Swap Chan", "Swap", "IN1L Mode" },
2173-
{ "IN1L Swap Chan", "Left", "IN1L Mode" },
2174-
{ "IN1R Swap Chan", "Left", "IN1L Mode" },
2175-
{ "IN1L Swap Chan", "Right", "IN1R Mode" },
2176-
{ "IN1R Swap Chan", "Right", "IN1R Mode" },
2177-
{ "IN1L PGA", NULL, "IN1L Swap Chan" },
2178-
{ "IN1R PGA", NULL, "IN1R Swap Chan" },
21792158

21802159
{ "IN1L PGA", NULL, "VOUT_MIC" },
21812160
{ "IN1R PGA", NULL, "VOUT_MIC" },
21822161

21832162
{ "IN2L Mux", NULL, "MICD_COMP_FRC" },
21842163
{ "IN2R Mux", NULL, "MICD_COMP_FRC" },
21852164

2165+
{ "IN2L PGA", NULL, "IN2L Mode" },
2166+
{ "IN2R PGA", NULL, "IN2R Mode" },
21862167
{ "IN2L Mode", "Analog", "IN2L Mux" },
21872168
{ "IN2R Mode", "Analog", "IN2R Mux" },
21882169
{ "IN2L Mode", "Digital", "IN2_PDMCLK" },
21892170
{ "IN2L Mode", "Digital", "IN2_PDMDATA" },
21902171
{ "IN2R Mode", "Digital", "IN2_PDMCLK" },
21912172
{ "IN2R Mode", "Digital", "IN2_PDMDATA" },
2192-
{ "IN2L Swap Chan", "Normal", "IN2L Mode" },
2193-
{ "IN2R Swap Chan", "Normal", "IN2R Mode" },
2194-
{ "IN2L Swap Chan", "Swap", "IN2R Mode" },
2195-
{ "IN2R Swap Chan", "Swap", "IN2L Mode" },
2196-
{ "IN2L Swap Chan", "Left", "IN2L Mode" },
2197-
{ "IN2R Swap Chan", "Left", "IN2L Mode" },
2198-
{ "IN2L Swap Chan", "Right", "IN2R Mode" },
2199-
{ "IN2R Swap Chan", "Right", "IN2R Mode" },
2200-
{ "IN2L PGA", NULL, "IN2L Swap Chan" },
2201-
{ "IN2R PGA", NULL, "IN2R Swap Chan" },
22022173

22032174
{ "IN2L PGA", NULL, "VOUT_MIC" },
22042175
{ "IN2R PGA", NULL, "VOUT_MIC" },

‎sound/soc/codecs/cs48l32.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ SOC_SINGLE_EXT_TLV("IN2R Digital Volume", TACNA_IN2R_CONTROL2,
423423
SOC_ENUM("Input Ramp Up", tacna_in_vi_ramp),
424424
SOC_ENUM("Input Ramp Down", tacna_in_vd_ramp),
425425

426-
SOC_ENUM("IN2 Swap Chan", tacna_in_swap_chan_ctrl[1]),
426+
SOC_ENUM("IN2 Swap Chan", tacna_in2_swap_chan),
427427

428428
TACNA_RATE_ENUM("Ultrasonic 1 Rate", tacna_us_output_rate[0]),
429429
TACNA_RATE_ENUM("Ultrasonic 2 Rate", tacna_us_output_rate[1]),

‎sound/soc/codecs/tacna.c‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -694,29 +694,19 @@ const char * const tacna_in_swap_chan_texts[TACNA_IN_SWAP_CHAN_ENUM_SIZE] = {
694694
};
695695
EXPORT_SYMBOL_GPL(tacna_in_swap_chan_texts);
696696

697-
const struct soc_enum tacna_in_swap_chan_ctrl[] = {
698-
SOC_ENUM_SINGLE(TACNA_INPUT1_CONTROL1,
699-
TACNA_IN1_CHANNEL_MIX_SHIFT,
700-
ARRAY_SIZE(tacna_in_swap_chan_texts),
701-
tacna_in_swap_chan_texts),
702-
SOC_ENUM_SINGLE(TACNA_INPUT2_CONTROL1,
703-
TACNA_IN2_CHANNEL_MIX_SHIFT,
704-
ARRAY_SIZE(tacna_in_swap_chan_texts),
705-
tacna_in_swap_chan_texts),
706-
SOC_ENUM_SINGLE(TACNA_INPUT3_CONTROL1,
707-
TACNA_IN3_CHANNEL_MIX_SHIFT,
708-
ARRAY_SIZE(tacna_in_swap_chan_texts),
709-
tacna_in_swap_chan_texts),
710-
SOC_ENUM_SINGLE(TACNA_INPUT4_CONTROL1,
711-
TACNA_IN4_CHANNEL_MIX_SHIFT,
712-
ARRAY_SIZE(tacna_in_swap_chan_texts),
713-
tacna_in_swap_chan_texts),
714-
};
715-
EXPORT_SYMBOL_GPL(tacna_in_swap_chan_ctrl);
697+
static SOC_ENUM_SINGLE_DECL(tacna_in1_swap_chan,
698+
TACNA_INPUT1_CONTROL1,
699+
TACNA_IN1_CHANNEL_MIX_SHIFT,
700+
tacna_in_swap_chan_texts);
701+
702+
SOC_ENUM_SINGLE_DECL(tacna_in2_swap_chan,
703+
TACNA_INPUT2_CONTROL1,
704+
TACNA_IN2_CHANNEL_MIX_SHIFT,
705+
tacna_in_swap_chan_texts);
706+
EXPORT_SYMBOL_GPL(tacna_in2_swap_chan);
716707

717708
const struct snd_kcontrol_new tacna_in_swap_chan[] = {
718-
SOC_DAPM_ENUM("IN1 Swap Chan", tacna_in_swap_chan_ctrl[0]),
719-
SOC_DAPM_ENUM("IN2 Swap Chan", tacna_in_swap_chan_ctrl[1]),
709+
SOC_DAPM_ENUM("IN1 Swap Chan", tacna_in1_swap_chan),
720710
};
721711
EXPORT_SYMBOL_GPL(tacna_in_swap_chan);
722712

‎sound/soc/codecs/tacna.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ extern const struct snd_kcontrol_new tacna_inmux[];
434434
extern const char * const tacna_dmode_texts[TACNA_DMODE_TEXTS_SIZE];
435435
extern const struct snd_kcontrol_new tacna_dmode_mux[];
436436
extern const struct snd_kcontrol_new tacna_in_swap_chan[];
437-
extern const struct soc_enum tacna_in_swap_chan_ctrl[];
437+
extern const struct soc_enum tacna_in2_swap_chan;
438438
extern const char * const
439439
tacna_in_swap_chan_texts[TACNA_IN_SWAP_CHAN_ENUM_SIZE];
440440

0 commit comments

Comments
 (0)