[PATCH v2 3/8] ASoC: tlv320aic31xx: Fix the reset GPIO OF name

From: Andrew F. Davis
Date: Wed Nov 29 2017 - 12:16:18 EST


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

Fixes: e00447fafbf7 ("ASoC: tlv320aic31xx: Add basic codec driver implementation")

Signed-off-by: Andrew F. Davis <afd@xxxxxx>
---
sound/soc/codecs/tlv320aic31xx.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index e2862372c26e..4837f25b0760 100644
--- 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)
--
2.15.0