ASoC: ti: Convert RX51 to use exclusively GPIO descriptors

The RX51/Nokia n900 uses the legacy GPIO header to convert a GPIO
back to the global GPIO numberspace and then the jack using it
in the snd_soc_jack_add_gpios() call immediately looks up the
corresponding descriptor again.

The snd_soc_jack_add_gpios() handles GPIOs passed with devices
just fine: pass in the device instead, and rename the GPIO
to match the property in the device tree, and it should work
all the same but without all the trouble.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Link: https://lore.kernel.org/r/20230926-descriptors-asoc-ti-v1-2-60cf4f8adbc5@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/ti/rx51.c b/sound/soc/ti/rx51.c
index 322c398d209baf7c0cc3f700631405fd88700f71..047f852c79a9c339c00ece9f759d6f636a964a6e 100644 (file)
--- a/sound/soc/ti/rx51.c
+++ b/sound/soc/ti/rx51.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/delay.h>
-#include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/module.h>
@@ -33,7 +32,6 @@ enum {
 
 struct rx51_audio_pdata {
        struct gpio_desc *tvout_selection_gpio;
-       struct gpio_desc *jack_detection_gpio;
        struct gpio_desc *eci_sw_gpio;
        struct gpio_desc *speaker_amp_gpio;
 };
@@ -198,7 +196,7 @@ static struct snd_soc_jack rx51_av_jack;
 
 static struct snd_soc_jack_gpio rx51_av_jack_gpios[] = {
        {
-               .name = "avdet-gpio",
+               .name = "jack-detection",
                .report = SND_JACK_HEADSET,
                .invert = 1,
                .debounce_time = 200,
@@ -263,7 +261,6 @@ static const struct snd_kcontrol_new aic34_rx51_controls[] = {
 static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
-       struct rx51_audio_pdata *pdata = snd_soc_card_get_drvdata(card);
        int err;
 
        snd_soc_limit_volume(card, "TPA6130A2 Headphone Playback Volume", 42);
@@ -283,9 +280,9 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
                return err;
        }
 
-       /* prepare gpio for snd_soc_jack_add_gpios */
-       rx51_av_jack_gpios[0].gpio = desc_to_gpio(pdata->jack_detection_gpio);
-       devm_gpiod_put(card->dev, pdata->jack_detection_gpio);
+       rx51_av_jack_gpios[0].gpiod_dev = card->dev;
+       /* Name is assigned in the struct */
+       rx51_av_jack_gpios[0].idx = 0;
 
        err = snd_soc_jack_add_gpios(&rx51_av_jack,
                                     ARRAY_SIZE(rx51_av_jack_gpios),
@@ -425,14 +422,6 @@ static int rx51_soc_probe(struct platform_device *pdev)
                return PTR_ERR(pdata->tvout_selection_gpio);
        }
 
-       pdata->jack_detection_gpio = devm_gpiod_get(card->dev,
-                                                   "jack-detection",
-                                                   GPIOD_ASIS);
-       if (IS_ERR(pdata->jack_detection_gpio)) {
-               dev_err(card->dev, "could not get jack detection gpio\n");
-               return PTR_ERR(pdata->jack_detection_gpio);
-       }
-
        pdata->eci_sw_gpio = devm_gpiod_get(card->dev, "eci-switch",
                                            GPIOD_OUT_HIGH);
        if (IS_ERR(pdata->eci_sw_gpio)) {