Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Astrid Rost <astrid.rost@axis.com>
To: Mark Brown <broonie@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org, kernel@axis.com,
	linux-kernel@vger.kernel.org, Astrid Rost <astrid.rost@axis.com>
Subject: [PATCH v2 3/4] ASoC: ts3a227e: add set_jack and get_jack_type
Date: Fri, 20 Jan 2023 11:25:53 +0100	[thread overview]
Message-ID: <20230120102555.1523394-4-astrid.rost@axis.com> (raw)
In-Reply-To: <20230120102555.1523394-1-astrid.rost@axis.com>

Add set_jack and get_jack_type to allow simple-card-utils to add
a jack for it.

Add a devicetree entry jack-type of type snd_jack_type, in case not
all input types are required.

Signed-off-by: Astrid Rost <astrid.rost@axis.com>
---
 sound/soc/codecs/ts3a227e.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c
index 2305a472d132..432a327c6eb7 100644
--- a/sound/soc/codecs/ts3a227e.c
+++ b/sound/soc/codecs/ts3a227e.c
@@ -28,6 +28,7 @@ struct ts3a227e {
 	bool mic_present;
 	unsigned int buttons_held;
 	int irq;
+	int jack_type;
 };
 
 /* Button values to be reported on the jack */
@@ -258,7 +259,27 @@ int ts3a227e_enable_jack_detect(struct snd_soc_component *component,
 }
 EXPORT_SYMBOL_GPL(ts3a227e_enable_jack_detect);
 
-static struct snd_soc_component_driver ts3a227e_soc_driver;
+static int ts3a227e_set_jack(struct snd_soc_component *component,
+			     struct snd_soc_jack *jack, void *data)
+{
+	if (jack == NULL)
+		return -EINVAL;
+
+	return ts3a227e_enable_jack_detect(component, jack);
+}
+
+static int ts3a227e_get_jack_type(struct snd_soc_component *component)
+{
+	struct ts3a227e *ts3a227e = snd_soc_component_get_drvdata(component);
+
+	return ts3a227e->jack_type;
+}
+
+static const struct snd_soc_component_driver ts3a227e_soc_driver = {
+	.name = "ti,ts3a227e",
+	.set_jack = ts3a227e_set_jack,
+	.get_jack_type = ts3a227e_get_jack_type,
+};
 
 static const struct regmap_config ts3a227e_regmap_config = {
 	.val_bits = 8,
@@ -283,6 +304,12 @@ static int ts3a227e_parse_device_property(struct ts3a227e *ts3a227e,
 	u32 setting3_mask = 0;
 	int err;
 
+	err = device_property_read_u32(dev, "jack-type", &value);
+	if (!err)
+		ts3a227e->jack_type = value & SND_JACK_HEADSET;
+	else
+		ts3a227e->jack_type = SND_JACK_HEADSET;
+
 	err = device_property_read_u32(dev, "ti,micbias", &value);
 	if (!err) {
 		setting3_mask = MICBIAS_SETTING_MASK;
-- 
2.30.2


  parent reply	other threads:[~2023-01-20 10:27 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-20 10:25 [PATCH v2 0/4] ASoC: simple-card-utils: create jack inputs for aux_devs Astrid Rost
2023-01-20 10:25 ` [PATCH v2 1/4] ASoC: soc-component: add get_jack_type Astrid Rost
2023-01-20 10:25 ` [PATCH v2 2/4] ASoC: simple-card-utils: create jack inputs for aux_devs Astrid Rost
2023-01-20 10:25 ` Astrid Rost [this message]
2023-01-20 10:25 ` [PATCH v2 4/4] ASoC: dt-bindings: ti,ts3a227e.yaml: add jack-type Astrid Rost
2023-01-22 14:16   ` [PATCH v2 4/4] ASoC: dt-bindings: ti, ts3a227e.yaml: " Krzysztof Kozlowski
2023-01-23  8:39     ` Astrid Rost
2023-01-23  9:05       ` Krzysztof Kozlowski
2023-01-23  9:19         ` Astrid Rost
2023-01-23 22:09   ` Rob Herring
2023-01-24  8:46     ` Astrid Rost

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=20230120102555.1523394-4-astrid.rost@axis.com \
    --to=astrid.rost@axis.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=kernel@axis.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --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