[PATCH v2 0/4] ASoC: simple-card-utils: create jack inputs for aux_devs
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.
v1 -> v2: Auxiliary jack drivers return the correct snd_jack_type with the function: get_jack_type. - No devicetree changes in simple-card. - soc-component: changed name to: get_jack_type. - simple-jack-utils: updated algorithm to add jack devices. A device which returns a valid value on get_jack_type counts as jack device - ts3a227e: added devicetree property jack-type, added NULL check for jack.
Astrid Rost (4): [PATCH v2 1/4] ASoC: soc-component: add get_jack_type [PATCH v2 2/4] ASoC: simple-card-utils: create jack inputs for aux_devs [PATCH v2 3/4] ASoC: ts3a227e: add set_jack and get_jack_type [PATCH v2 4/4] ASoC: dt-bindings: ti,ts3a227e.yaml: add jack-type
.../bindings/sound/ti,ts3a227e.yaml | 8 +++ include/sound/simple_card_utils.h | 3 ++ include/sound/soc-component.h | 2 + sound/soc/codecs/ts3a227e.c | 29 ++++++++++- sound/soc/generic/simple-card-utils.c | 49 +++++++++++++++++++ sound/soc/generic/simple-card.c | 4 ++ sound/soc/soc-component.c | 20 ++++++++ 7 files changed, 114 insertions(+), 1 deletion(-)
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 astrid.rost@axis.com --- 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);
/* 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);
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_component *component, } EXPORT_SYMBOL_GPL(snd_soc_component_set_jack);
+/** + * 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 = -ENOTSUPP; + + if (component->driver->get_jack_type) + ret = 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) {
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 astrid.rost@axis.com --- 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/simple-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);
+int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix) +{ + struct snd_soc_card *card = simple_priv_to_card(priv); + struct snd_soc_component *component; + int found_jack_index = 0; + int type = 0; + int num = 0; + int ret; + + if (priv->aux_jacks) + return 0; + + for_each_card_auxs(card, component) { + type = snd_soc_component_get_jack_type(component); + if (type > 0) + num++; + } + if (num < 1) + return 0; + + priv->aux_jacks = 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 >= num) + break; + + type = snd_soc_component_get_jack_type(component); + if (type <= 0) + continue; + + /* create jack */ + jack = &(priv->aux_jacks[found_jack_index++]); + snprintf(id, sizeof(id), "%s-jack", component->name); + ret = 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-card.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;
+ ret = asoc_simple_init_aux_jacks(priv, PREFIX); + if (ret < 0) + return ret; + return 0; }
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;
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 astrid.rost@axis.com --- Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml b/Documentation/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
+ 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).
On 20/01/2023 11:25, Astrid Rost wrote:
Add jack-type: Bitmap value of snd_jack_type to allow combining card drivers to create a jack for it.
Subject: drop "yaml". We do not filename extensions to subject prefix. Nowhere.
Signed-off-by: Astrid Rost astrid.rost@axis.com
Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml b/Documentation/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
- 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
Why the device would once support (allow) headphone and once not? Device either always supports them or never...
1 SND_JACK_HEADPHONE2 SND_JACK_MICROPHONE
minimum and maximum
- default: 3
- ti,micbias: $ref: /schemas/types.yaml#/definitions/uint32 description: Intended MICBIAS voltage (datasheet section 9.6.7).
Best regards, Krzysztof
Hello Krzysztof,
On 1/22/23 15:16, Krzysztof Kozlowski wrote:
On 20/01/2023 11:25, Astrid Rost wrote:
Add jack-type: Bitmap value of snd_jack_type to allow combining card drivers to create a jack for it.
Subject: drop "yaml". We do not filename extensions to subject prefix. Nowhere.
yes, true.
Signed-off-by: Astrid Rost astrid.rost@axis.com
Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml b/Documentation/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
- 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 isWhy the device would once support (allow) headphone and once not? Device either always supports them or never...
If a device has two connectors (pink and green), one for the microphone and one for the headset. It would be easier to see from the available events, which is which. But of course it is possible to give it good names. My first approach was, that it returned all supported types, so no devicetree change needed. But by colleges agreed that it would be nice to remove unused flags. I am happy to remove it and someone who requires it can add it.
1 SND_JACK_HEADPHONE2 SND_JACK_MICROPHONEminimum and maximum
I do not understand this? It is a bitmap. I can put it as an enum: - 1 # SND_JACK_HEADPHONE - 2 # SND_JACK_MICROPHONE - 3 # SND_JACK_HEADPHONE | SND_JACK_MICROPHONE
- default: 3
- ti,micbias: $ref: /schemas/types.yaml#/definitions/uint32 description: Intended MICBIAS voltage (datasheet section 9.6.7).
Best regards, Krzysztof
Thank you for your comments
Astrid
On 23/01/2023 09:39, Astrid Rost wrote:
Hello Krzysztof,
On 1/22/23 15:16, Krzysztof Kozlowski wrote:
On 20/01/2023 11:25, Astrid Rost wrote:
Add jack-type: Bitmap value of snd_jack_type to allow combining card drivers to create a jack for it.
Subject: drop "yaml". We do not filename extensions to subject prefix. Nowhere.
yes, true.
Signed-off-by: Astrid Rost astrid.rost@axis.com
Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml b/Documentation/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
- 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 isWhy the device would once support (allow) headphone and once not? Device either always supports them or never...
If a device has two connectors (pink and green), one for the microphone and one for the headset.
We talk about "ts3a227" here, which has always two connectors (pins)... unless you refer to the case when these are e.g. grounded?
It would be easier to see from the available events, which is which. But of course it is possible to give it good names. My first approach was, that it returned all supported types, so no devicetree change needed. But by colleges agreed that it would be nice to remove unused flags. I am happy to remove it and someone who requires it can add it.
1 SND_JACK_HEADPHONE2 SND_JACK_MICROPHONEminimum and maximum
I do not understand this? It is a bitmap. I can put it as an enum:
- 1 # SND_JACK_HEADPHONE
- 2 # SND_JACK_MICROPHONE
- 3 # SND_JACK_HEADPHONE | SND_JACK_MICROPHONE
Then maximum is OR of them, isn't it?
Best regards, Krzysztof
Hello,
On 1/23/23 10:05, Krzysztof Kozlowski wrote:
On 23/01/2023 09:39, Astrid Rost wrote:
Hello Krzysztof,
On 1/22/23 15:16, Krzysztof Kozlowski wrote:
On 20/01/2023 11:25, Astrid Rost wrote:
Add jack-type: Bitmap value of snd_jack_type to allow combining card drivers to create a jack for it.
Subject: drop "yaml". We do not filename extensions to subject prefix. Nowhere.
yes, true.
Signed-off-by: Astrid Rost astrid.rost@axis.com
Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml b/Documentation/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
- 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 isWhy the device would once support (allow) headphone and once not? Device either always supports them or never...
If a device has two connectors (pink and green), one for the microphone and one for the headset.
We talk about "ts3a227" here, which has always two connectors (pins)... unless you refer to the case when these are e.g. grounded?
yes, that is what I meant. I push a version, where I remove this.
It would be easier to see from the available events, which is which. But of course it is possible to give it good names. My first approach was, that it returned all supported types, so no devicetree change needed. But by colleges agreed that it would be nice to remove unused flags. I am happy to remove it and someone who requires it can add it.
1 SND_JACK_HEADPHONE2 SND_JACK_MICROPHONEminimum and maximum
I do not understand this? It is a bitmap. I can put it as an enum:
- 1 # SND_JACK_HEADPHONE
- 2 # SND_JACK_MICROPHONE
- 3 # SND_JACK_HEADPHONE | SND_JACK_MICROPHONE
Then maximum is OR of them, isn't it?
yes 1-3
Best regards, Krzysztof
Astrid
On Fri, Jan 20, 2023 at 11:25:54AM +0100, Astrid Rost wrote:
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 astrid.rost@axis.com
Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml b/Documentation/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
- jack-type:
- $ref: /schemas/types.yaml#/definitions/uint32
- description: Bitmap value of snd_jack_type to allow combining
snd_jack_type? Is that a Linux thing? Bindings are independent of Linux.
card drivers to create a jack for it. Supported is1 SND_JACK_HEADPHONE2 SND_JACK_MICROPHONE- default: 3
I'm pretty sure jack properties are more complicated than just headphone and/or microphone. There's buttons which are detected in differing ways.
Rob
Hello Rob,
On 1/23/23 23:09, Rob Herring wrote:
On Fri, Jan 20, 2023 at 11:25:54AM +0100, Astrid Rost wrote:
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 astrid.rost@axis.com
Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml b/Documentation/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
- jack-type:
- $ref: /schemas/types.yaml#/definitions/uint32
- description: Bitmap value of snd_jack_type to allow combining
snd_jack_type? Is that a Linux thing? Bindings are independent of Linux.
card drivers to create a jack for it. Supported is1 SND_JACK_HEADPHONE2 SND_JACK_MICROPHONE- default: 3
I'm pretty sure jack properties are more complicated than just headphone and/or microphone. There's buttons which are detected in differing ways.
Yes, you are right. On the buttons, someone would like to have an keymapping like KEY_VOLUMEDOWN, KEY_VOLUMEUP for the different buttons SND_JACK_BTN_X. This is always added to the jack by the ts3a227e driver.
I pushed yesterday a v3, which returns all supported jack types by this device. I am happy with this.
Rob
Best regards
Astrid
participants (4)
-
Astrid Rost -
Astrid Rost -
Krzysztof Kozlowski -
Rob Herring