From: Jonathan Marek <jonathan@marek.ca>
To: linux-arm-msm@vger.kernel.org
Cc: "Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>,
"Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>,
"Johan Hovold" <johan+linaro@kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@baylibre.com>,
"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>,
"Srinivas Kandagatla" <srinivas.kandagatla@linaro.org>,
linux-sound@vger.kernel.org (open list:SOUND - SOC LAYER /
DYNAMIC AUDIO POWER MANAGEM...),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH] ASoC: codecs: wcd938x: fix wcd938x_get_swr_port
Date: Mon, 7 Oct 2024 19:54:09 -0400 [thread overview]
Message-ID: <20241007235418.2257-1-jonathan@marek.ca> (raw)
Controls can share the same "portidx" value (e.g. HPHL and HPHR), this
leads to wcd938x_get_swr_port returning incorrect state. For example,
when trying to enable both HPHL/HPHR with amixer: after enabling HPHL,
HPHR will appear enabled and amixer skips writing to the control.
This could be fixed by indexing with "ch_idx" instead, but lets just get
rid of port_enable[] and check the ch_mask value of the port instead.
Fixes: e8ba1e05bdc0 ("ASoC: codecs: wcd938x: add basic controls")
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
---
sound/soc/codecs/wcd938x.c | 9 ++++++---
sound/soc/codecs/wcd938x.h | 1 -
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c
index f2a4f3262bdbc..12c991beeca52 100644
--- a/sound/soc/codecs/wcd938x.c
+++ b/sound/soc/codecs/wcd938x.c
@@ -1854,14 +1854,19 @@ static int wcd938x_get_swr_port(struct snd_kcontrol *kcontrol,
struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(comp);
struct wcd938x_sdw_priv *wcd;
struct soc_mixer_control *mixer = (struct soc_mixer_control *)kcontrol->private_value;
+ struct sdw_port_config *port_config;
int dai_id = mixer->shift;
int portidx, ch_idx = mixer->reg;
wcd = wcd938x->sdw_priv[dai_id];
portidx = wcd->ch_info[ch_idx].port_num;
+ port_config = &wcd->port_config[portidx - 1];
- ucontrol->value.integer.value[0] = wcd->port_enable[portidx];
+ if (port_config->ch_mask & wcd->ch_info[ch_idx].ch_mask)
+ ucontrol->value.integer.value[0] = true;
+ else
+ ucontrol->value.integer.value[0] = false;
return 0;
}
@@ -1887,8 +1892,6 @@ static int wcd938x_set_swr_port(struct snd_kcontrol *kcontrol,
else
enable = false;
- wcd->port_enable[portidx] = enable;
-
wcd938x_connect_port(wcd, portidx, ch_idx, enable);
return 1;
diff --git a/sound/soc/codecs/wcd938x.h b/sound/soc/codecs/wcd938x.h
index fb6a0e4ef3377..d4f400c50115c 100644
--- a/sound/soc/codecs/wcd938x.h
+++ b/sound/soc/codecs/wcd938x.h
@@ -650,7 +650,6 @@ struct wcd938x_sdw_priv {
struct sdw_stream_runtime *sruntime;
struct sdw_port_config port_config[WCD938X_MAX_SWR_PORTS];
const struct wcd938x_sdw_ch_info *ch_info;
- bool port_enable[WCD938X_MAX_SWR_CH_IDS];
int active_ports;
bool is_tx;
struct wcd938x_priv *wcd938x;
--
2.45.1
reply other threads:[~2024-10-07 23:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20241007235418.2257-1-jonathan@marek.ca \
--to=jonathan@marek.ca \
--cc=broonie@kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=johan+linaro@kernel.org \
--cc=krzysztof.kozlowski@linaro.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=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.com \
--cc=u.kleine-koenig@baylibre.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;
as well as URLs for NNTP newsgroup(s).