ASoC: tlv320aic31xx: Use standard reset GPIO OF name

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

[Retitled for accuracy -- broonie]

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index e2862372c26e1f6807c7f5d7035c1b9d2722ae45..4837f25b0760e131e81b0da75ee90edb83cbf1b1 100644 (file)
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1279,9 +1279,16 @@ static void aic31xx_pdata_from_of(struct aic31xx_priv *aic31xx)
                aic31xx->pdata.micbias_vg = MICBIAS_2_0V;
        }
 
-       ret = of_get_named_gpio(np, "gpio-reset", 0);
-       if (ret > 0)
+       ret = of_get_named_gpio(np, "reset-gpios", 0);
+       if (ret > 0) {
                aic31xx->pdata.gpio_reset = ret;
+       } else {
+               ret = of_get_named_gpio(np, "gpio-reset", 0);
+               if (ret > 0) {
+                       dev_warn(aic31xx->dev, "Using deprecated property \"gpio-reset\", please update your DT");
+                       aic31xx->pdata.gpio_reset = ret;
+               }
+       }
 }
 #else /* CONFIG_OF */
 static void aic31xx_pdata_from_of(struct aic31xx_priv *aic31xx)