From: Richard Fitzgerald <rf@opensource.cirrus.com>
To: <broonie@kernel.org>
Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>,
<patches@opensource.cirrus.com>,
Richard Fitzgerald <rf@opensource.cirrus.com>
Subject: [PATCH 3/4] ASoC: cs35l56: Remove SDW2RX1 mixer source
Date: Tue, 18 Apr 2023 15:43:08 +0100 [thread overview]
Message-ID: <20230418144309.1100721-4-rf@opensource.cirrus.com> (raw)
In-Reply-To: <20230418144309.1100721-1-rf@opensource.cirrus.com>
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>
---
include/sound/cs35l56.h | 3 +--
sound/soc/codecs/cs35l56-shared.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
index dd7503464651..0b2f7cfc6a4a 100644
--- a/include/sound/cs35l56.h
+++ b/include/sound/cs35l56.h
@@ -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
diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c
index f5fa6bb04d38..93a1b056660b 100644
--- a/sound/soc/codecs/cs35l56-shared.c
+++ b/sound/soc/codecs/cs35l56-shared.c
@@ -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);
--
2.30.2
next prev parent reply other threads:[~2023-04-18 14:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 14:43 [PATCH 0/4] ASoC: cs35l56: Updates for B0 silicon Richard Fitzgerald
2023-04-18 14:43 ` [PATCH 1/4] ASoC: cs35l56: Update comment on masking of EINT20 interrupts Richard Fitzgerald
2023-04-18 14:43 ` [PATCH 2/4] ASoC: cs35l56: Remove SDW1 TX5 and TX6 Richard Fitzgerald
2023-04-18 14:43 ` Richard Fitzgerald [this message]
2023-04-18 14:43 ` [PATCH 4/4] ASoC: cs35l56: Rename mixer source defines for SoundWire DP1 Richard Fitzgerald
2023-04-18 18:09 ` [PATCH 0/4] ASoC: cs35l56: Updates for B0 silicon Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230418144309.1100721-4-rf@opensource.cirrus.com \
--to=rf@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®