[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20251229111839.4009517-3-shengjiu.wang@nxp.com>
Date: Mon, 29 Dec 2025 19:18:39 +0800
From: Shengjiu Wang <shengjiu.wang@....com>
To: broonie@...nel.org,
kuninori.morimoto.gx@...esas.com,
lgirdwood@...il.com,
perex@...ex.cz,
tiwai@...e.com,
linux-sound@...r.kernel.org,
linux-kernel@...r.kernel.org,
robh@...nel.org,
krzk+dt@...nel.org,
conor+dt@...nel.org,
devicetree@...r.kernel.org
Subject: [PATCH 2/2] ASoC: simple-card-utils: Add support of "hp-pin-name-headphone" property
The 'Headphones Jack' name used in current simple-card and audio-graph
card driver can't be recognized by user space service daemon like
pulseaudio and pipewire, which only recognize the 'Headphone Jack',
so add 'hp-pin-name-headphone' property for this case and it won't block
original use cases for 'Headphones Jack'
Signed-off-by: Shengjiu Wang <shengjiu.wang@....com>
---
sound/soc/generic/simple-card-utils.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index bdc02e85b089..3d2194e23373 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -779,6 +779,24 @@ int simple_util_parse_pin_switches(struct snd_soc_card *card,
}
EXPORT_SYMBOL_GPL(simple_util_parse_pin_switches);
+static const char *simple_util_parse_hp_pin_name(struct snd_soc_card *card,
+ char *prefix, char *pin)
+{
+ struct device_node *node = card->dev->of_node;
+ const char *str = NULL;
+ char prop[128];
+
+ if (!prefix)
+ prefix = "";
+
+ snprintf(prop, sizeof(prop), "%s%s", prefix, "hp-pin-name-headphone");
+
+ if (of_property_present(node, prop))
+ str = "Headphone";
+
+ return pin ? pin : (str ? str : "Headphones");
+}
+
int simple_util_init_jack(struct snd_soc_card *card,
struct simple_util_jack *sjack,
int is_hp, char *prefix,
@@ -787,7 +805,7 @@ int simple_util_init_jack(struct snd_soc_card *card,
struct device *dev = card->dev;
struct gpio_desc *desc;
char prop[128];
- char *pin_name;
+ const char *pin_name;
char *gpio_name;
int mask;
int error;
@@ -797,7 +815,7 @@ int simple_util_init_jack(struct snd_soc_card *card,
if (is_hp) {
snprintf(prop, sizeof(prop), "%shp-det", prefix);
- pin_name = pin ? pin : "Headphones";
+ pin_name = simple_util_parse_hp_pin_name(card, prefix, pin);
gpio_name = "Headphone detection";
mask = SND_JACK_HEADPHONE;
} else {
--
2.34.1
Powered by blists - more mailing lists