From: Jonathan Marek <jonathan@marek.ca>
To: linux-arm-msm@vger.kernel.org
Cc: Srinivas Kandagatla <srini@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
linux-sound@vger.kernel.org (open list:QCOM AUDIO (ASoC) DRIVERS),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v3 1/2] ASoC: codecs: lpass-wsa-macro: add RX4/RX5/RX6/RX7/RX8
Date: Tue, 25 Nov 2025 17:35:32 -0500 [thread overview]
Message-ID: <20251125223848.1798-2-jonathan@marek.ca> (raw)
In-Reply-To: <20251125223848.1798-1-jonathan@marek.ca>
This allows playback using the WSA_2CH AIF, which feeds RX4 and RX5 on both
WSA and WSA2.
RX6/RX7/RX8 can be tested with the regular WSA AIF (the 3rd intf is RX8,
the 5th intf is RX6/7).
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
---
sound/soc/codecs/lpass-wsa-macro.c | 96 +++++++++++++++++++++++++++++-
1 file changed, 94 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
index 74a812fa7dcb2..e00b901eb3a0c 100644
--- a/sound/soc/codecs/lpass-wsa-macro.c
+++ b/sound/soc/codecs/lpass-wsa-macro.c
@@ -299,6 +299,11 @@ enum {
WSA_MACRO_RX1,
WSA_MACRO_RX_MIX0,
WSA_MACRO_RX_MIX1,
+ WSA_MACRO_RX4,
+ WSA_MACRO_RX5,
+ WSA_MACRO_RX6,
+ WSA_MACRO_RX7,
+ WSA_MACRO_RX8,
WSA_MACRO_RX_MAX,
};
@@ -2227,6 +2232,16 @@ static const struct snd_kcontrol_new rx_mux[WSA_MACRO_RX_MAX] = {
wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
SOC_DAPM_ENUM_EXT("WSA RX_MIX1 Mux", rx_mux_enum,
wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
+ SOC_DAPM_ENUM_EXT("WSA RX4 Mux", rx_mux_enum,
+ wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
+ SOC_DAPM_ENUM_EXT("WSA RX5 Mux", rx_mux_enum,
+ wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
+ SOC_DAPM_ENUM_EXT("WSA RX6 Mux", rx_mux_enum,
+ wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
+ SOC_DAPM_ENUM_EXT("WSA RX7 Mux", rx_mux_enum,
+ wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
+ SOC_DAPM_ENUM_EXT("WSA RX8 Mux", rx_mux_enum,
+ wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
};
static int wsa_macro_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,
@@ -2409,6 +2424,16 @@ static const struct snd_soc_dapm_widget wsa_macro_dapm_widgets_v2_5[] = {
SND_SOC_DAPM_MUX("WSA_RX1 INP1", SND_SOC_NOPM, 0, 0, &rx1_prim_inp1_mux_v2_5),
SND_SOC_DAPM_MUX("WSA_RX1 INP2", SND_SOC_NOPM, 0, 0, &rx1_prim_inp2_mux_v2_5),
SND_SOC_DAPM_MUX("WSA_RX1 MIX INP", SND_SOC_NOPM, 0, 0, &rx1_mix_mux_v2_5),
+ SND_SOC_DAPM_MIXER("WSA RX4", SND_SOC_NOPM, 0, 0, NULL, 0),
+ SND_SOC_DAPM_MIXER("WSA RX5", SND_SOC_NOPM, 0, 0, NULL, 0),
+ SND_SOC_DAPM_MIXER("WSA RX6", SND_SOC_NOPM, 0, 0, NULL, 0),
+ SND_SOC_DAPM_MIXER("WSA RX7", SND_SOC_NOPM, 0, 0, NULL, 0),
+ SND_SOC_DAPM_MIXER("WSA RX8", SND_SOC_NOPM, 0, 0, NULL, 0),
+ SND_SOC_DAPM_MUX("WSA RX4 MUX", SND_SOC_NOPM, WSA_MACRO_RX4, 0, &rx_mux[WSA_MACRO_RX4]),
+ SND_SOC_DAPM_MUX("WSA RX5 MUX", SND_SOC_NOPM, WSA_MACRO_RX5, 0, &rx_mux[WSA_MACRO_RX5]),
+ SND_SOC_DAPM_MUX("WSA RX6 MUX", SND_SOC_NOPM, WSA_MACRO_RX6, 0, &rx_mux[WSA_MACRO_RX6]),
+ SND_SOC_DAPM_MUX("WSA RX7 MUX", SND_SOC_NOPM, WSA_MACRO_RX7, 0, &rx_mux[WSA_MACRO_RX7]),
+ SND_SOC_DAPM_MUX("WSA RX8 MUX", SND_SOC_NOPM, WSA_MACRO_RX8, 0, &rx_mux[WSA_MACRO_RX8]),
};
static const struct snd_soc_dapm_route wsa_audio_map[] = {
@@ -2528,6 +2553,64 @@ static const struct snd_soc_dapm_route wsa_audio_map[] = {
{"WSA_SPK2 OUT", NULL, "WSA_MCLK"},
};
+static const struct snd_soc_dapm_route wsa_audio_map_v2_5[] = {
+ {"WSA RX4 MUX", "AIF1_PB", "WSA AIF1 PB"},
+ {"WSA RX5 MUX", "AIF1_PB", "WSA AIF1 PB"},
+ {"WSA RX6 MUX", "AIF1_PB", "WSA AIF1 PB"},
+ {"WSA RX7 MUX", "AIF1_PB", "WSA AIF1 PB"},
+ {"WSA RX8 MUX", "AIF1_PB", "WSA AIF1 PB"},
+ {"WSA RX4 MUX", "AIF_MIX1_PB", "WSA AIF_MIX1 PB"},
+ {"WSA RX5 MUX", "AIF_MIX1_PB", "WSA AIF_MIX1 PB"},
+ {"WSA RX6 MUX", "AIF_MIX1_PB", "WSA AIF_MIX1 PB"},
+ {"WSA RX7 MUX", "AIF_MIX1_PB", "WSA AIF_MIX1 PB"},
+ {"WSA RX8 MUX", "AIF_MIX1_PB", "WSA AIF_MIX1 PB"},
+ {"WSA RX4", NULL, "WSA RX4 MUX"},
+ {"WSA RX5", NULL, "WSA RX5 MUX"},
+ {"WSA RX6", NULL, "WSA RX6 MUX"},
+ {"WSA RX7", NULL, "WSA RX7 MUX"},
+ {"WSA RX8", NULL, "WSA RX8 MUX"},
+ {"WSA_RX0 INP0", "RX4", "WSA RX4"},
+ {"WSA_RX0 INP0", "RX5", "WSA RX5"},
+ {"WSA_RX0 INP0", "RX6", "WSA RX6"},
+ {"WSA_RX0 INP0", "RX7", "WSA RX7"},
+ {"WSA_RX0 INP0", "RX8", "WSA RX8"},
+ {"WSA_RX0 INP1", "RX4", "WSA RX4"},
+ {"WSA_RX0 INP1", "RX5", "WSA RX5"},
+ {"WSA_RX0 INP1", "RX6", "WSA RX6"},
+ {"WSA_RX0 INP1", "RX7", "WSA RX7"},
+ {"WSA_RX0 INP1", "RX8", "WSA RX8"},
+ {"WSA_RX0 INP2", "RX4", "WSA RX4"},
+ {"WSA_RX0 INP2", "RX5", "WSA RX5"},
+ {"WSA_RX0 INP2", "RX6", "WSA RX6"},
+ {"WSA_RX0 INP2", "RX7", "WSA RX7"},
+ {"WSA_RX0 INP2", "RX8", "WSA RX8"},
+ {"WSA_RX0 MIX INP", "RX4", "WSA RX4"},
+ {"WSA_RX0 MIX INP", "RX5", "WSA RX5"},
+ {"WSA_RX0 MIX INP", "RX6", "WSA RX6"},
+ {"WSA_RX0 MIX INP", "RX7", "WSA RX7"},
+ {"WSA_RX0 MIX INP", "RX8", "WSA RX8"},
+ {"WSA_RX1 INP0", "RX4", "WSA RX4"},
+ {"WSA_RX1 INP0", "RX5", "WSA RX5"},
+ {"WSA_RX1 INP0", "RX6", "WSA RX6"},
+ {"WSA_RX1 INP0", "RX7", "WSA RX7"},
+ {"WSA_RX1 INP0", "RX8", "WSA RX8"},
+ {"WSA_RX1 INP1", "RX4", "WSA RX4"},
+ {"WSA_RX1 INP1", "RX5", "WSA RX5"},
+ {"WSA_RX1 INP1", "RX6", "WSA RX6"},
+ {"WSA_RX1 INP1", "RX7", "WSA RX7"},
+ {"WSA_RX1 INP1", "RX8", "WSA RX8"},
+ {"WSA_RX1 INP2", "RX4", "WSA RX4"},
+ {"WSA_RX1 INP2", "RX5", "WSA RX5"},
+ {"WSA_RX1 INP2", "RX6", "WSA RX6"},
+ {"WSA_RX1 INP2", "RX7", "WSA RX7"},
+ {"WSA_RX1 INP2", "RX8", "WSA RX8"},
+ {"WSA_RX1 MIX INP", "RX4", "WSA RX4"},
+ {"WSA_RX1 MIX INP", "RX5", "WSA RX5"},
+ {"WSA_RX1 MIX INP", "RX6", "WSA RX6"},
+ {"WSA_RX1 MIX INP", "RX7", "WSA RX7"},
+ {"WSA_RX1 MIX INP", "RX8", "WSA RX8"},
+};
+
static int wsa_swrm_clock(struct wsa_macro *wsa, bool enable)
{
struct regmap *regmap = wsa->regmap;
@@ -2561,7 +2644,9 @@ static int wsa_macro_component_probe(struct snd_soc_component *comp)
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(comp);
struct wsa_macro *wsa = snd_soc_component_get_drvdata(comp);
const struct snd_soc_dapm_widget *widgets;
- unsigned int num_widgets;
+ const struct snd_soc_dapm_route *routes;
+ unsigned int num_widgets, num_routes;
+ int ret;
snd_soc_component_init_regmap(comp, wsa->regmap);
@@ -2586,6 +2671,7 @@ static int wsa_macro_component_probe(struct snd_soc_component *comp)
case LPASS_CODEC_VERSION_2_1:
widgets = wsa_macro_dapm_widgets_v2_1;
num_widgets = ARRAY_SIZE(wsa_macro_dapm_widgets_v2_1);
+ num_routes = 0;
break;
case LPASS_CODEC_VERSION_2_5:
case LPASS_CODEC_VERSION_2_6:
@@ -2594,12 +2680,18 @@ static int wsa_macro_component_probe(struct snd_soc_component *comp)
case LPASS_CODEC_VERSION_2_9:
widgets = wsa_macro_dapm_widgets_v2_5;
num_widgets = ARRAY_SIZE(wsa_macro_dapm_widgets_v2_5);
+ routes = wsa_audio_map_v2_5;
+ num_routes = ARRAY_SIZE(wsa_audio_map_v2_5);
break;
default:
return -EINVAL;
}
- return snd_soc_dapm_new_controls(dapm, widgets, num_widgets);
+ ret = snd_soc_dapm_new_controls(dapm, widgets, num_widgets);
+ if (ret)
+ return ret;
+
+ return snd_soc_dapm_add_routes(dapm, routes, num_routes);
}
static int swclk_gate_enable(struct clk_hw *hw)
--
2.51.0
next prev parent reply other threads:[~2025-11-25 22:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-25 22:35 [PATCH v3 0/2] ASoC: codecs: lpass-wsa-macro: add RX4/RX5/RX6/RX7/RX8 Jonathan Marek
2025-11-25 22:35 ` Jonathan Marek [this message]
2025-12-14 10:36 ` [PATCH v3 1/2] " Mark Brown
2025-11-25 22:35 ` [PATCH v3 2/2] ASoC: codecs: lpass-wsa-macro: use ports as the DAIs for playback Jonathan Marek
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=20251125223848.1798-2-jonathan@marek.ca \
--to=jonathan@marek.ca \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=srini@kernel.org \
--cc=tiwai@suse.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