ASoC: rt5665: Convert to use GPIO descriptors

The RT5665 driver has some stub support for GPIO descriptors
going back to the initial driver commit, where there are
two GPIO descriptors for the LDO and headphone detection
defined in the device state. Well, let's make use of the
descriptor properly.

We remove the global GPIO number from the platform data,
but it is still possible to create board files using GPIO
descriptor tables, if desired.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230817-descriptors-asoc-rt-v2-2-02fa2ca3e5b0@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/rt5665.h b/include/sound/rt5665.h
index 3b3d6a19ca499d381c504247a255d9833d111604..e865f041929bea950f2838086e5d04f7a354b62c 100644 (file)
--- a/include/sound/rt5665.h
+++ b/include/sound/rt5665.h
@@ -31,8 +31,6 @@ struct rt5665_platform_data {
        bool in3_diff;
        bool in4_diff;
 
-       int ldo1_en; /* GPIO for LDO1_EN */
-
        enum rt5665_dmic1_data_pin dmic1_data_pin;
        enum rt5665_dmic2_data_pin dmic2_data_pin;
        enum rt5665_jd_src jd_src;

diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c
index 525713c33d71622953f66233cb6af533085bac72..a39de4a7df002c99b3ee0b56e0b7c6060b9adaef 100644 (file)
--- a/sound/soc/codecs/rt5665.c
+++ b/sound/soc/codecs/rt5665.c
@@ -15,8 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/acpi.h>
-#include <linux/gpio.h>
-#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/regulator/consumer.h>
 #include <linux/mutex.h>
 #include <sound/core.h>
@@ -4659,9 +4658,6 @@ static int rt5665_parse_dt(struct rt5665_priv *rt5665, struct device *dev)
        of_property_read_u32(dev->of_node, "realtek,jd-src",
                &rt5665->pdata.jd_src);
 
-       rt5665->pdata.ldo1_en = of_get_named_gpio(dev->of_node,
-               "realtek,ldo1-en-gpios", 0);
-
        return 0;
 }
 
@@ -4795,10 +4791,13 @@ static int rt5665_i2c_probe(struct i2c_client *i2c)
                return ret;
        }
 
-       if (gpio_is_valid(rt5665->pdata.ldo1_en)) {
-               if (devm_gpio_request_one(&i2c->dev, rt5665->pdata.ldo1_en,
-                                         GPIOF_OUT_INIT_HIGH, "rt5665"))
-                       dev_err(&i2c->dev, "Fail gpio_request gpio_ldo\n");
+
+       rt5665->gpiod_ldo1_en = devm_gpiod_get_optional(&i2c->dev,
+                                                       "realtek,ldo1-en",
+                                                       GPIOD_OUT_HIGH);
+       if (IS_ERR(rt5665->gpiod_ldo1_en)) {
+               dev_err(&i2c->dev, "Failed gpio request ldo1_en\n");
+               return PTR_ERR(rt5665->gpiod_ldo1_en);
        }
 
        /* Sleep for 300 ms miniumum */