Skip to content

Commit d3a4efb

Browse files
rfvirgilbroonie
authored andcommitted
ASoC: cs35l56: Remove SDW2RX1 mixer source
The mixer source index value for SDW2RX1 is different between A1 and B0 silicon. As the driver doesn't provide a DAI for SDW2 just remove it as a mixer source option. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Link: https://lore.kernel.org/r/20230418144309.1100721-4-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 5ab28c7 commit d3a4efb

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

include/sound/cs35l56.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,9 @@
181181
#define CS35L56_INPUT_SRC_INTERPOLATOR 0x40
182182
#define CS35L56_INPUT_SRC_SWIRE_RX1 0x44
183183
#define CS35L56_INPUT_SRC_SWIRE_RX2 0x45
184-
#define CS35L56_INPUT_SRC_SWIRE_RX3 0x46
185184
#define CS35L56_INPUT_MASK 0x7F
186185

187-
#define CS35L56_NUM_INPUT_SRC 22
186+
#define CS35L56_NUM_INPUT_SRC 21
188187

189188
/* ASP formats */
190189
#define CS35L56_ASP_FMT_DSP_A 0

sound/soc/codecs/cs35l56-shared.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ const char * const cs35l56_tx_input_texts[] = {
278278
"None", "ASP1RX1", "ASP1RX2", "VMON", "IMON", "ERRVOL", "CLASSH",
279279
"VDDBMON", "VBSTMON", "DSP1TX1", "DSP1TX2", "DSP1TX3", "DSP1TX4",
280280
"DSP1TX5", "DSP1TX6", "DSP1TX7", "DSP1TX8", "TEMPMON",
281-
"INTERPOLATOR", "SDW1RX1", "SDW1RX2", "SDW2RX1",
281+
"INTERPOLATOR", "SDW1RX1", "SDW1RX2",
282282
};
283283
EXPORT_SYMBOL_NS_GPL(cs35l56_tx_input_texts, SND_SOC_CS35L56_SHARED);
284284

@@ -304,7 +304,6 @@ const unsigned int cs35l56_tx_input_values[] = {
304304
CS35L56_INPUT_SRC_INTERPOLATOR,
305305
CS35L56_INPUT_SRC_SWIRE_RX1,
306306
CS35L56_INPUT_SRC_SWIRE_RX2,
307-
CS35L56_INPUT_SRC_SWIRE_RX3,
308307
};
309308
EXPORT_SYMBOL_NS_GPL(cs35l56_tx_input_values, SND_SOC_CS35L56_SHARED);
310309

0 commit comments

Comments
 (0)