From nobody Sun Sep 14 14:31:14 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DFECC05027 for ; Fri, 20 Jan 2023 10:26:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229908AbjATK0V (ORCPT ); Fri, 20 Jan 2023 05:26:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229675AbjATK0K (ORCPT ); Fri, 20 Jan 2023 05:26:10 -0500 Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2558E9F3AA for ; Fri, 20 Jan 2023 02:26:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1674210369; x=1705746369; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/WXW21EG+pqy+W42CXni76Bfh0YGb++llEepThhlRRc=; b=IKW7nFv+LKDHnO2nGa+XolXARk8MsIrLWPKINcm5X9iW6Ha6IFy88gOg RNonyCEfi2zx4FgcpNF0EjJBLJ6JIvTiliIZQCVgbZy0nsMqAPZL8Q3Lg 1nH5wtQGGQC8zSNCoIFHWhuYfS63X4JVWT6QP/j9U/r/WmtSXNcMTMroV 5Aas294uor/+6iJldludXwqB2CuQy/5mYVXnpnFRiL2ZNQ3EBr+KZl9zr zzO22sTJJaQ2S1iiKgNKMkfoyq/kdQbAlSC3myqDyKRoy0QdJZHh+yQgQ Rf80EJ8LmNK06yr4OtnLgTRnhy9UfnpGQxY69vVQvpZnZhdmMAAaRhMFG g==; From: Astrid Rost To: Mark Brown , Liam Girdwood , Krzysztof Kozlowski , Jaroslav Kysela , Takashi Iwai CC: , , , Astrid Rost Subject: [PATCH v2 1/4] ASoC: soc-component: add get_jack_type Date: Fri, 20 Jan 2023 11:25:51 +0100 Message-ID: <20230120102555.1523394-2-astrid.rost@axis.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230120102555.1523394-1-astrid.rost@axis.com> References: <20230120102555.1523394-1-astrid.rost@axis.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add function to return the jack type of snd_jack_types. This allows a generic card driver to add a jack with the specified type. Signed-off-by: Astrid Rost --- include/sound/soc-component.h | 2 ++ sound/soc/soc-component.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h index c26ffb033777..3203d35bc8c1 100644 --- a/include/sound/soc-component.h +++ b/include/sound/soc-component.h @@ -98,6 +98,7 @@ struct snd_soc_component_driver { int source, unsigned int freq_in, unsigned int freq_out); int (*set_jack)(struct snd_soc_component *component, struct snd_soc_jack *jack, void *data); + int (*get_jack_type)(struct snd_soc_component *component); =20 /* DT */ int (*of_xlate_dai_name)(struct snd_soc_component *component, @@ -384,6 +385,7 @@ int snd_soc_component_set_pll(struct snd_soc_component = *component, int pll_id, unsigned int freq_out); int snd_soc_component_set_jack(struct snd_soc_component *component, struct snd_soc_jack *jack, void *data); +int snd_soc_component_get_jack_type(struct snd_soc_component *component); =20 void snd_soc_component_seq_notifier(struct snd_soc_component *component, enum snd_soc_dapm_type type, int subseq); diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c index e12f8244242b..3cd6952212e1 100644 --- a/sound/soc/soc-component.c +++ b/sound/soc/soc-component.c @@ -256,6 +256,26 @@ int snd_soc_component_set_jack(struct snd_soc_componen= t *component, } EXPORT_SYMBOL_GPL(snd_soc_component_set_jack); =20 +/** + * snd_soc_component_get_jack_type + * @component: COMPONENTs + * + * Returns the jack type of the component + * This can either be the supported type or one read from + * devicetree with the property: jack-type. + */ +int snd_soc_component_get_jack_type( + struct snd_soc_component *component) +{ + int ret =3D -ENOTSUPP; + + if (component->driver->get_jack_type) + ret =3D component->driver->get_jack_type(component); + + return soc_component_ret(component, ret); +} +EXPORT_SYMBOL_GPL(snd_soc_component_get_jack_type); + int snd_soc_component_module_get(struct snd_soc_component *component, void *mark, int upon_open) { --=20 2.30.2 From nobody Sun Sep 14 14:31:14 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B7C3C05027 for ; Fri, 20 Jan 2023 10:26:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229653AbjATK0Y (ORCPT ); Fri, 20 Jan 2023 05:26:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229598AbjATK0L (ORCPT ); Fri, 20 Jan 2023 05:26:11 -0500 Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 703079D287 for ; Fri, 20 Jan 2023 02:26:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1674210370; x=1705746370; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vpu9tETurwEUff35qr7E5xH/0FKUrT9IUn9FLfI3fJw=; b=KhiBi/UDzsjpe11KThqbHkPTj0K7x1gJonTZrRKQpbrC9Ok389NXyhRH DtGmutBiadvBzCW8Jrq/VrBJzFYNu8J8Ar01VlyCgzvFz/N6a901VXfqh hAHYXFrCT/gRiMJhfYlTMR7CX6aGr3xFkhg9OOqxOJARDBJqdxK3ZT9f9 gVSklChgBNVecTHamI1VJbDY1PqVihqO4BnfCi2scUXLx8Sl3lK6NsDmU 8N/4sS0MiTJrS5T0XuUU7V6lR+CzTVuFS2ISh+ElX3kVQIUiqn2jZpsC+ oymCPVr20fw1z/I5/F4COGSb+c7sefDM0TKUTSz1om3pFonhQhuPqaoAW w==; From: Astrid Rost To: Mark Brown , Liam Girdwood , Krzysztof Kozlowski , Jaroslav Kysela , Takashi Iwai CC: , , , Astrid Rost Subject: [PATCH v2 2/4] ASoC: simple-card-utils: create jack inputs for aux_devs Date: Fri, 20 Jan 2023 11:25:52 +0100 Message-ID: <20230120102555.1523394-3-astrid.rost@axis.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230120102555.1523394-1-astrid.rost@axis.com> References: <20230120102555.1523394-1-astrid.rost@axis.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a generic way to create jack inputs for auxiliary jack detection drivers (e.g. via i2c, spi), which are not part of any real codec. The simple-card can be used as combining card driver to add the jacks, no new one is required. Create a jack (for input-events) for jack devices in the auxiliary device list (aux_devs). A device which returns a valid value on get_jack_type counts as jack device; set_jack is required to add the jack to the device. Signed-off-by: Astrid Rost --- include/sound/simple_card_utils.h | 3 ++ sound/soc/generic/simple-card-utils.c | 49 +++++++++++++++++++++++++++ sound/soc/generic/simple-card.c | 4 +++ 3 files changed, 56 insertions(+) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_= utils.h index 38590f1ae9ee..a3f3f3aa9e6e 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -69,6 +69,7 @@ struct asoc_simple_priv { } *dai_props; struct asoc_simple_jack hp_jack; struct asoc_simple_jack mic_jack; + struct snd_soc_jack *aux_jacks; struct snd_soc_dai_link *dai_link; struct asoc_simple_dai *dais; struct snd_soc_dai_link_component *dlcs; @@ -187,6 +188,8 @@ int asoc_simple_parse_pin_switches(struct snd_soc_card = *card, int asoc_simple_init_jack(struct snd_soc_card *card, struct asoc_simple_jack *sjack, int is_hp, char *prefix, char *pin); +int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv, + char *prefix); int asoc_simple_init_priv(struct asoc_simple_priv *priv, struct link_info *li); int asoc_simple_remove(struct platform_device *pdev); diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simp= le-card-utils.c index e35becce9635..56552a616f21 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -786,6 +786,55 @@ int asoc_simple_init_jack(struct snd_soc_card *card, } EXPORT_SYMBOL_GPL(asoc_simple_init_jack); =20 +int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix) +{ + struct snd_soc_card *card =3D simple_priv_to_card(priv); + struct snd_soc_component *component; + int found_jack_index =3D 0; + int type =3D 0; + int num =3D 0; + int ret; + + if (priv->aux_jacks) + return 0; + + for_each_card_auxs(card, component) { + type =3D snd_soc_component_get_jack_type(component); + if (type > 0) + num++; + } + if (num < 1) + return 0; + + priv->aux_jacks =3D devm_kcalloc(card->dev, num, + sizeof(struct snd_soc_jack), GFP_KERNEL); + if (!priv->aux_jacks) + return -ENOMEM; + + for_each_card_auxs(card, component) { + char id[128]; + struct snd_soc_jack *jack; + + if (found_jack_index >=3D num) + break; + + type =3D snd_soc_component_get_jack_type(component); + if (type <=3D 0) + continue; + + /* create jack */ + jack =3D &(priv->aux_jacks[found_jack_index++]); + snprintf(id, sizeof(id), "%s-jack", component->name); + ret =3D snd_soc_card_jack_new(card, id, type, jack); + if (ret) + continue; + + (void)snd_soc_component_set_jack(component, jack, NULL); + } + return 0; +} +EXPORT_SYMBOL_GPL(asoc_simple_init_aux_jacks); + int asoc_simple_init_priv(struct asoc_simple_priv *priv, struct link_info *li) { diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-car= d.c index feb55b66239b..e98932c16754 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -623,6 +623,10 @@ static int simple_soc_probe(struct snd_soc_card *card) if (ret < 0) return ret; =20 + ret =3D asoc_simple_init_aux_jacks(priv, PREFIX); + if (ret < 0) + return ret; + return 0; } =20 --=20 2.30.2 From nobody Sun Sep 14 14:31:14 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C9F4C27C7C for ; Fri, 20 Jan 2023 10:26:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229716AbjATK0N (ORCPT ); Fri, 20 Jan 2023 05:26:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229567AbjATK0J (ORCPT ); Fri, 20 Jan 2023 05:26:09 -0500 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 170399084D for ; Fri, 20 Jan 2023 02:26:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1674210365; x=1705746365; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U2imJO+1R/ob6ECocsNc0QXBaMhDnHjJe1WKPivTPyc=; b=cS3zSBYiP6ELvWA5DFzEW/5wbkEsy3SrmwX0mrege+DuFVl8LqKghAPR pSJQRRbbTaqKzFNyd5H3XuUdNpJQuHKwxfVJEX5CFyytmu+jfGWmeBTdD KO3DA19EP8pX8cE78nEHW8m1xhRxIdU9WPc65kGt/DyKuwMcqoboZXWor Yah4mLgIftYbPJ8rvTKEponll+UiA6Trg41M14JNOgNCm1U9vb3KJg1WL wKyuZsqcTpMgfwIyhAOD83vxjZyXtZ79l1U+hHaas/AFOqUEu4HlEFz9j HbGJ5x1xoUPsErydFBHclJjCdI9plZRHd4QlEYFeKaLVeAxCXIRHJQJ1r w==; From: Astrid Rost To: Mark Brown , Liam Girdwood , Krzysztof Kozlowski , Jaroslav Kysela , Takashi Iwai CC: , , , Astrid Rost Subject: [PATCH v2 3/4] ASoC: ts3a227e: add set_jack and get_jack_type Date: Fri, 20 Jan 2023 11:25:53 +0100 Message-ID: <20230120102555.1523394-4-astrid.rost@axis.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230120102555.1523394-1-astrid.rost@axis.com> References: <20230120102555.1523394-1-astrid.rost@axis.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- 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; }; =20 /* Button values to be reported on the jack */ @@ -258,7 +259,27 @@ int ts3a227e_enable_jack_detect(struct snd_soc_compone= nt *component, } EXPORT_SYMBOL_GPL(ts3a227e_enable_jack_detect); =20 -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 =3D=3D NULL) + return -EINVAL; + + return ts3a227e_enable_jack_detect(component, jack); +} + +static int ts3a227e_get_jack_type(struct snd_soc_component *component) +{ + struct ts3a227e *ts3a227e =3D snd_soc_component_get_drvdata(component); + + return ts3a227e->jack_type; +} + +static const struct snd_soc_component_driver ts3a227e_soc_driver =3D { + .name =3D "ti,ts3a227e", + .set_jack =3D ts3a227e_set_jack, + .get_jack_type =3D ts3a227e_get_jack_type, +}; =20 static const struct regmap_config ts3a227e_regmap_config =3D { .val_bits =3D 8, @@ -283,6 +304,12 @@ static int ts3a227e_parse_device_property(struct ts3a2= 27e *ts3a227e, u32 setting3_mask =3D 0; int err; =20 + err =3D device_property_read_u32(dev, "jack-type", &value); + if (!err) + ts3a227e->jack_type =3D value & SND_JACK_HEADSET; + else + ts3a227e->jack_type =3D SND_JACK_HEADSET; + err =3D device_property_read_u32(dev, "ti,micbias", &value); if (!err) { setting3_mask =3D MICBIAS_SETTING_MASK; --=20 2.30.2 From nobody Sun Sep 14 14:31:14 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 984D3C25B4E for ; Fri, 20 Jan 2023 10:26:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229689AbjATK0S (ORCPT ); Fri, 20 Jan 2023 05:26:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229623AbjATK0K (ORCPT ); Fri, 20 Jan 2023 05:26:10 -0500 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5877F9084D; Fri, 20 Jan 2023 02:26:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1674210369; x=1705746369; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zq0C28u4Y8exuvoqKW0nWKnZEuIJ+MuaDC7ZdjB7/+8=; b=WGNkUbVVwUovQWGDGvb+5cw/1bRPkJ9r9bjCe9ruOWR10PEyfBBIfSs/ fEMGL6zBrLErFnbbQ3JO2/+bQX8F0uIv9aH7Hs6AAWWnaGoJK+crPBNOH UnHcrQAEJKddO69FJCTNiTqVOrNZ+zmhrG2NFxn898sIOlg/b7SJU1JoL eCCNzE9Yj5LG1KHvKFqPLZfZllQjJ+zuy5DL6+ibr1aD9yDpJP/AGLpAU nrkQNnd4xjWfI6h+ip43KucNy7Qse35YlwMw0rD2wLlSthiV2bNykhQ3l 6hoXr1mdZHN6gF9gaVQqCtn6k6lWrnY7hiIVss/TMmAsvYnFlE0vPzZMs g==; From: Astrid Rost To: Mark Brown , Liam Girdwood , Krzysztof Kozlowski , Rob Herring , Dylan Reid CC: , , , Astrid Rost , Subject: [PATCH v2 4/4] ASoC: dt-bindings: ti,ts3a227e.yaml: add jack-type Date: Fri, 20 Jan 2023 11:25:54 +0100 Message-ID: <20230120102555.1523394-5-astrid.rost@axis.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230120102555.1523394-1-astrid.rost@axis.com> References: <20230120102555.1523394-1-astrid.rost@axis.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add jack-type: Bitmap value of snd_jack_type to allow combining card drivers to create a jack for it. Signed-off-by: Astrid Rost --- Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml b/Doc= umentation/devicetree/bindings/sound/ti,ts3a227e.yaml index 785930658029..1d949b805f98 100644 --- a/Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml +++ b/Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml @@ -27,6 +27,14 @@ properties: interrupts: maxItems: 1 =20 + jack-type: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Bitmap value of snd_jack_type to allow combining + card drivers to create a jack for it. Supported is + 1 SND_JACK_HEADPHONE + 2 SND_JACK_MICROPHONE + default: 3 + ti,micbias: $ref: /schemas/types.yaml#/definitions/uint32 description: Intended MICBIAS voltage (datasheet section 9.6.7). --=20 2.30.2