ASoC: rt5682s: Convert to use GPIO descriptors

Convert the RT5682S to use GPIO descriptors and drop the
legacy GPIO headers.

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-5-02fa2ca3e5b0@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/rt5682s.h b/include/sound/rt5682s.h
index f18d91308b9a0b14214ab31d46b8a04da05b8d5a..66ca0c75b914e3d077a932b00f49cd21ed8bfb7b 100644 (file)
--- a/include/sound/rt5682s.h
+++ b/include/sound/rt5682s.h
@@ -32,9 +32,6 @@ enum rt5682s_dai_clks {
 };
 
 struct rt5682s_platform_data {
-
-       int ldo1_en; /* GPIO for LDO1_EN */
-
        enum rt5682s_dmic1_data_pin dmic1_data_pin;
        enum rt5682s_dmic1_clk_pin dmic1_clk_pin;
        enum rt5682s_jd_src jd_src;

diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c
index c77c675bd5f585b790ae3a989c6b913d6c67af91..68ac5ea50396d5723f514348f51d51b89bef8b59 100644 (file)
--- a/sound/soc/codecs/rt5682s.c
+++ b/sound/soc/codecs/rt5682s.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/mutex.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -2973,9 +2972,6 @@ static int rt5682s_parse_dt(struct rt5682s_priv *rt5682s, struct device *dev)
        device_property_read_u32(dev, "realtek,amic-delay-ms",
                &rt5682s->pdata.amic_delay);
 
-       rt5682s->pdata.ldo1_en = of_get_named_gpio(dev->of_node,
-               "realtek,ldo1-en-gpios", 0);
-
        if (device_property_read_string_array(dev, "clock-output-names",
                                              rt5682s->pdata.dai_clk_names,
                                              RT5682S_DAI_NUM_CLKS) < 0)
@@ -3172,10 +3168,12 @@ static int rt5682s_i2c_probe(struct i2c_client *i2c)
                return ret;
        }
 
-       if (gpio_is_valid(rt5682s->pdata.ldo1_en)) {
-               if (devm_gpio_request_one(&i2c->dev, rt5682s->pdata.ldo1_en,
-                                         GPIOF_OUT_INIT_HIGH, "rt5682s"))
-                       dev_err(&i2c->dev, "Fail gpio_request gpio_ldo\n");
+       rt5682s->ldo1_en = devm_gpiod_get_optional(&i2c->dev,
+                                                  "realtek,ldo1-en",
+                                                  GPIOD_OUT_HIGH);
+       if (IS_ERR(rt5682s->ldo1_en)) {
+               dev_err(&i2c->dev, "Fail gpio request ldo1_en\n");
+               return PTR_ERR(rt5682s->ldo1_en);
        }
 
        /* Sleep for 50 ms minimum */

diff --git a/sound/soc/codecs/rt5682s.h b/sound/soc/codecs/rt5682s.h
index caa7733b430f262ad02b476e98377273e5ce9732..1d79d432d0d8f08737ef9767a4d76b362b53d973 100644 (file)
--- a/sound/soc/codecs/rt5682s.h
+++ b/sound/soc/codecs/rt5682s.h
@@ -11,6 +11,7 @@
 
 #include <sound/rt5682s.h>
 #include <linux/regulator/consumer.h>
+#include <linux/gpio/consumer.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/clk-provider.h>
@@ -1446,6 +1447,7 @@ enum {
 struct rt5682s_priv {
        struct snd_soc_component *component;
        struct rt5682s_platform_data pdata;
+       struct gpio_desc *ldo1_en;
        struct regmap *regmap;
        struct snd_soc_jack *hs_jack;
        struct regulator_bulk_data supplies[RT5682S_NUM_SUPPLIES];