Unverified Commit d3a4efb3 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

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: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230418144309.1100721-4-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5ab28c78

include/sound/cs35l56.h

+1 −2
Original line number Diff line number Diff line
@@ -181,10 +181,9 @@ 
#define CS35L56_INPUT_SRC_INTERPOLATOR			0x40

#define CS35L56_INPUT_SRC_SWIRE_RX1			0x44

#define CS35L56_INPUT_SRC_SWIRE_RX2			0x45

#define CS35L56_INPUT_SRC_SWIRE_RX3			0x46

#define CS35L56_INPUT_MASK				0x7F



#define CS35L56_NUM_INPUT_SRC				22

#define CS35L56_NUM_INPUT_SRC				21



/* ASP formats */

#define CS35L56_ASP_FMT_DSP_A				0

sound/soc/codecs/cs35l56-shared.c

+1 −2
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ const char * const cs35l56_tx_input_texts[] = { 
	"None", "ASP1RX1", "ASP1RX2", "VMON", "IMON", "ERRVOL", "CLASSH",

	"VDDBMON", "VBSTMON", "DSP1TX1", "DSP1TX2", "DSP1TX3", "DSP1TX4",

	"DSP1TX5", "DSP1TX6", "DSP1TX7", "DSP1TX8", "TEMPMON",

	"INTERPOLATOR", "SDW1RX1", "SDW1RX2", "SDW2RX1",

	"INTERPOLATOR", "SDW1RX1", "SDW1RX2",

};

EXPORT_SYMBOL_NS_GPL(cs35l56_tx_input_texts, SND_SOC_CS35L56_SHARED);
@@ -304,7 +304,6 @@ const unsigned int cs35l56_tx_input_values[] = { 
	CS35L56_INPUT_SRC_INTERPOLATOR,

	CS35L56_INPUT_SRC_SWIRE_RX1,

	CS35L56_INPUT_SRC_SWIRE_RX2,

	CS35L56_INPUT_SRC_SWIRE_RX3,

};

EXPORT_SYMBOL_NS_GPL(cs35l56_tx_input_values, SND_SOC_CS35L56_SHARED);