github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-30 19:21:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: Clean up {hp,mic}-det-gpio handling

Browse Source 
Merge series from Geert Uytterhoeven <geert+renesas@glider.be>:

The "gpio" suffix for GPIO consumers was deprecated a while ago, in
favor of the "gpios" suffix.  However, there are still several users of
the "hp-det-gpio" and "mic-det-gpio" properties, in DT bindings,
drivers, and DT source files.

Drivers that use gpiolib handle both the deprecated and new properties
transparently, but that is not the case when using of_property_*() calls
directly.
This commit is contained in:
Mark Brown 2024-10-05 04:51:35 +01:00
commit 1a22f70157
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/devicetree/bindings/sound/audio-graph.yaml
View File

@ -37,8 +37,14 @@ properties:
pa-gpios:
maxItems: 1
hp-det-gpio:
deprecated: true
maxItems: 1
hp-det-gpios:
maxItems: 1
mic-det-gpio:
deprecated: true
maxItems: 1
mic-det-gpios:
maxItems: 1
required:

12
Documentation/devicetree/bindings/sound/simple-card.yaml
View File

@ -207,8 +207,14 @@ properties:
simple-audio-card,pin-switches:
$ref: "#/definitions/pin-switches"
simple-audio-card,hp-det-gpio:
deprecated: true
maxItems: 1
simple-audio-card,hp-det-gpios:
maxItems: 1
simple-audio-card,mic-det-gpio:
deprecated: true
maxItems: 1
simple-audio-card,mic-det-gpios:
maxItems: 1
patternProperties:
@ -256,8 +262,14 @@ patternProperties:
pin-switches:
$ref: "#/definitions/pin-switches"
hp-det-gpio:
deprecated: true
maxItems: 1
hp-det-gpios:
maxItems: 1
mic-det-gpio:
deprecated: true
maxItems: 1
mic-det-gpios:
maxItems: 1
patternProperties:

8
sound/soc/fsl/fsl-asoc-card.c
View File

@ -1033,14 +1033,15 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
}
/*
* Properties "hp-det-gpio" and "mic-det-gpio" are optional, and
* Properties "hp-det-gpios" and "mic-det-gpios" are optional, and
* simple_util_init_jack() uses these properties for creating
* Headphone Jack and Microphone Jack.
*
* The notifier is initialized in snd_soc_card_jack_new(), then
* snd_soc_jack_notifier_register can be called.
*/
if (of_property_read_bool(np, "hp-det-gpio")) {
if (of_property_read_bool(np, "hp-det-gpios") ||
of_property_read_bool(np, "hp-det-gpio") /* deprecated */) {
ret = simple_util_init_jack(&priv->card, &priv->hp_jack,
1, NULL, "Headphone Jack");
if (ret)
@ -1049,7 +1050,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
snd_soc_jack_notifier_register(&priv->hp_jack.jack, &hp_jack_nb);
}
if (of_property_read_bool(np, "mic-det-gpio")) {
if (of_property_read_bool(np, "mic-det-gpios") ||
of_property_read_bool(np, "mic-det-gpio") /* deprecated */) {
ret = simple_util_init_jack(&priv->card, &priv->mic_jack,
0, NULL, "Mic Jack");
if (ret)