Skip to content

Commit 2b97428

Browse files
Hendrik v. Ravenbroonie
authored andcommitted
ASoc: simple-mux: add idle-state support
So far the mux changes it state immediately, even when not in use. Allow overriding this behaviour by specifying an optional idle-state. This state is used whenever the mux is powered down, only switching to the selected state on power up. If unspecified it defaults to as-is, maintaining the previous behaviour. Signed-off-by: Hendrik v. Raven <h.v.raven@merzmedtech.de> Link: https://patch.msgid.link/20241114-simple-mux-idle-state-v2-1-a30cb37d2be2@merzmedtech.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 2d5404c commit 2b97428

File tree

1 file changed

+38
-1
lines changed

1 file changed

+38
-1
lines changed

sound/soc/codecs/simple-mux.c

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <linux/gpio/consumer.h>
88
#include <linux/module.h>
9+
#include <linux/mux/driver.h>
910
#include <linux/regulator/consumer.h>
1011
#include <sound/soc.h>
1112

@@ -16,6 +17,7 @@ struct simple_mux {
1617
struct gpio_desc *gpiod_mux;
1718
unsigned int mux;
1819
const char *mux_texts[MUX_TEXT_SIZE];
20+
unsigned int idle_state;
1921
struct soc_enum mux_enum;
2022
struct snd_kcontrol_new mux_mux;
2123
struct snd_soc_dapm_widget mux_widgets[MUX_WIDGET_SIZE];
@@ -57,6 +59,9 @@ static int simple_mux_control_put(struct snd_kcontrol *kcontrol,
5759

5860
priv->mux = ucontrol->value.enumerated.item[0];
5961

62+
if (priv->idle_state != MUX_IDLE_AS_IS && dapm->bias_level < SND_SOC_BIAS_PREPARE)
63+
return 0;
64+
6065
gpiod_set_value_cansleep(priv->gpiod_mux, priv->mux);
6166

6267
return snd_soc_dapm_mux_update_power(dapm, kcontrol,
@@ -75,10 +80,33 @@ static unsigned int simple_mux_read(struct snd_soc_component *component,
7580
static const struct snd_kcontrol_new simple_mux_mux =
7681
SOC_DAPM_ENUM_EXT("Muxer", simple_mux_enum, simple_mux_control_get, simple_mux_control_put);
7782

83+
static int simple_mux_event(struct snd_soc_dapm_widget *w,
84+
struct snd_kcontrol *kcontrol, int event)
85+
{
86+
struct snd_soc_component *c = snd_soc_dapm_to_component(w->dapm);
87+
struct simple_mux *priv = snd_soc_component_get_drvdata(c);
88+
89+
if (priv->idle_state != MUX_IDLE_AS_IS) {
90+
switch (event) {
91+
case SND_SOC_DAPM_PRE_PMU:
92+
gpiod_set_value_cansleep(priv->gpiod_mux, priv->mux);
93+
break;
94+
case SND_SOC_DAPM_POST_PMD:
95+
gpiod_set_value_cansleep(priv->gpiod_mux, priv->idle_state);
96+
break;
97+
default:
98+
break;
99+
}
100+
}
101+
102+
return 0;
103+
}
104+
78105
static const struct snd_soc_dapm_widget simple_mux_dapm_widgets[MUX_WIDGET_SIZE] = {
79106
SND_SOC_DAPM_INPUT("IN1"),
80107
SND_SOC_DAPM_INPUT("IN2"),
81-
SND_SOC_DAPM_MUX("MUX", SND_SOC_NOPM, 0, 0, &simple_mux_mux), // see simple_mux_probe()
108+
SND_SOC_DAPM_MUX_E("MUX", SND_SOC_NOPM, 0, 0, &simple_mux_mux, // see simple_mux_probe()
109+
simple_mux_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
82110
SND_SOC_DAPM_OUTPUT("OUT"),
83111
};
84112

@@ -93,6 +121,7 @@ static int simple_mux_probe(struct platform_device *pdev)
93121
struct device *dev = &pdev->dev;
94122
struct device_node *np = dev->of_node;
95123
struct simple_mux *priv;
124+
int ret;
96125

97126
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
98127
if (!priv)
@@ -121,6 +150,14 @@ static int simple_mux_probe(struct platform_device *pdev)
121150
/* Overwrite text ("Input 1", "Input 2") if property exists */
122151
of_property_read_string_array(np, "state-labels", priv->mux_texts, MUX_TEXT_SIZE);
123152

153+
ret = of_property_read_u32(np, "idle-state", &priv->idle_state);
154+
if (ret < 0) {
155+
priv->idle_state = MUX_IDLE_AS_IS;
156+
} else if (priv->idle_state != MUX_IDLE_AS_IS && priv->idle_state >= 2) {
157+
dev_err(dev, "invalid idle-state %u\n", priv->idle_state);
158+
return -EINVAL;
159+
}
160+
124161
/* switch to use priv data instead of default */
125162
priv->mux_enum.texts = priv->mux_texts;
126163
priv->mux_mux.private_value = (unsigned long)&priv->mux_enum;

0 commit comments

Comments
 (0)