The correct DT property for specifying a GPIO used for reset
is "reset-gpios", fix this here.

Fixes: c24fdc886fde ("ASoC: tlv320aic3x: Add device tree bindings")

Signed-off-by: Andrew F. Davis <a...@ti.com>
---
 sound/soc/codecs/tlv320aic3x.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 06f92571eba4..b751cad545da 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1804,11 +1804,18 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
                if (!ai3x_setup)
                        return -ENOMEM;
 
-               ret = of_get_named_gpio(np, "gpio-reset", 0);
-               if (ret >= 0)
+               ret = of_get_named_gpio(np, "reset-gpios", 0);
+               if (ret >= 0) {
                        aic3x->gpio_reset = ret;
-               else
-                       aic3x->gpio_reset = -1;
+               } else {
+                       ret = of_get_named_gpio(np, "gpio-reset", 0);
+                       if (ret > 0) {
+                               dev_warn(&i2c->dev, "Using deprecated property 
\"gpio-reset\", please update your DT");
+                               aic3x->gpio_reset = ret;
+                       } else {
+                               aic3x->gpio_reset = -1;
+                       }
+               }
 
                if (of_property_read_u32_array(np, "ai3x-gpio-func",
                                        ai3x_setup->gpio_func, 2) >= 0) {
-- 
2.15.0

Reply via email to