ASoC: rt5640: Convert to just use GPIO descriptors

The RT5640 driver is already using GPIO descriptors for some
stuff, all that is needed is to convert the remaining LDO1
control line to also use descriptors.

Simplify the code using gpiod_get_optional() and drop the
special "of" parsing function: these descriptors need not
come from device tree and it's optional so hey.

Keep some NULL checks around the GPIO operations even though
gpiolib is essentially NULL-tolerant, because by checking
for whether we have a valid GPIO descriptor or not we can
avoid a 400 ms delay which is great.

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

diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index eceed820978774835987d0bebb06d0e8813d62af..8920726c38e88d19bf1a986be14ccb2a5d16284f 100644 (file)
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -12,11 +12,10 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
 #include <linux/of.h>
-#include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/acpi.h>
@@ -2812,8 +2811,8 @@ static int rt5640_suspend(struct snd_soc_component *component)
        rt5640_reset(component);
        regcache_cache_only(rt5640->regmap, true);
        regcache_mark_dirty(rt5640->regmap);
-       if (gpio_is_valid(rt5640->ldo1_en))
-               gpio_set_value_cansleep(rt5640->ldo1_en, 0);
+       if (rt5640->ldo1_en)
+               gpiod_set_value_cansleep(rt5640->ldo1_en, 0);
 
        return 0;
 }
@@ -2822,8 +2821,8 @@ static int rt5640_resume(struct snd_soc_component *component)
 {
        struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);
 
-       if (gpio_is_valid(rt5640->ldo1_en)) {
-               gpio_set_value_cansleep(rt5640->ldo1_en, 1);
+       if (rt5640->ldo1_en) {
+               gpiod_set_value_cansleep(rt5640->ldo1_en, 1);
                msleep(400);
        }
 
@@ -2986,22 +2985,6 @@ static const struct acpi_device_id rt5640_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match);
 #endif
 
-static int rt5640_parse_dt(struct rt5640_priv *rt5640, struct device_node *np)
-{
-       rt5640->ldo1_en = of_get_named_gpio(np, "realtek,ldo1-en-gpios", 0);
-       /*
-        * LDO1_EN is optional (it may be statically tied on the board).
-        * -ENOENT means that the property doesn't exist, i.e. there is no
-        * GPIO, so is not an error. Any other error code means the property
-        * exists, but could not be parsed.
-        */
-       if (!gpio_is_valid(rt5640->ldo1_en) &&
-                       (rt5640->ldo1_en != -ENOENT))
-               return rt5640->ldo1_en;
-
-       return 0;
-}
-
 static int rt5640_i2c_probe(struct i2c_client *i2c)
 {
        struct rt5640_priv *rt5640;
@@ -3015,12 +2998,16 @@ static int rt5640_i2c_probe(struct i2c_client *i2c)
                return -ENOMEM;
        i2c_set_clientdata(i2c, rt5640);
 
-       if (i2c->dev.of_node) {
-               ret = rt5640_parse_dt(rt5640, i2c->dev.of_node);
-               if (ret)
-                       return ret;
-       } else
-               rt5640->ldo1_en = -EINVAL;
+       rt5640->ldo1_en = devm_gpiod_get_optional(&i2c->dev,
+                                                 "realtek,ldo1-en",
+                                                 GPIOD_OUT_HIGH);
+       if (IS_ERR(rt5640->ldo1_en))
+               return PTR_ERR(rt5640->ldo1_en);
+
+       if (rt5640->ldo1_en) {
+               gpiod_set_consumer_name(rt5640->ldo1_en, "RT5640 LDO1_EN");
+               msleep(400);
+       }
 
        rt5640->regmap = devm_regmap_init_i2c(i2c, &rt5640_regmap);
        if (IS_ERR(rt5640->regmap)) {
@@ -3030,18 +3017,6 @@ static int rt5640_i2c_probe(struct i2c_client *i2c)
                return ret;
        }
 
-       if (gpio_is_valid(rt5640->ldo1_en)) {
-               ret = devm_gpio_request_one(&i2c->dev, rt5640->ldo1_en,
-                                           GPIOF_OUT_INIT_HIGH,
-                                           "RT5640 LDO1_EN");
-               if (ret < 0) {
-                       dev_err(&i2c->dev, "Failed to request LDO1_EN %d: %d\n",
-                               rt5640->ldo1_en, ret);
-                       return ret;
-               }
-               msleep(400);
-       }
-
        regmap_read(rt5640->regmap, RT5640_VENDOR_ID2, &val);
        if (val != RT5640_DEVICE_ID) {
                dev_err(&i2c->dev,

diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 9847a1ae01f445348d0571bc6f9e9790949f69fe..94b9a502f7f9d24624c065909f629732e04fd378 100644 (file)
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -2138,7 +2138,7 @@ struct rt5640_priv {
        struct regmap *regmap;
        struct clk *mclk;
 
-       int ldo1_en; /* GPIO for LDO1_EN */
+       struct gpio_desc *ldo1_en; /* GPIO for LDO1_EN */
        int irq;
        int jd_gpio_irq;
        int sysclk;