| Message ID | 20200722154706.9657-2-dmurphy@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] dt-bindings: tas2562: Convert the tas2562 binding to yaml | expand |
Hello On 7/22/20 10:47 AM, Dan Murphy wrote: > Update the shutdown GPIO property to be shutdown from shut-down. > > Fixes: c173dba44c2d2 ("ASoC: tas2562: Introduce the TAS2562 amplifier") > Signed-off-by: Dan Murphy <dmurphy@ti.com> > --- > > v2 - Set sdz_gpio to NULL if gpio property not present. > > sound/soc/codecs/tas2562.c | 21 +++++++++++++++++---- > 1 file changed, 17 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c > index e74628061040..8a53633a3853 100644 > --- a/sound/soc/codecs/tas2562.c > +++ b/sound/soc/codecs/tas2562.c > @@ -680,12 +680,25 @@ static int tas2562_parse_dt(struct tas2562_data *tas2562) > struct device *dev = tas2562->dev; > int ret = 0; > > - tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shut-down", > - GPIOD_OUT_HIGH); > + tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shutdown", > + GPIOD_OUT_HIGH); > if (IS_ERR(tas2562->sdz_gpio)) { > - if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER) { > - tas2562->sdz_gpio = NULL; > + tas2562->sdz_gpio = NULL; This is incorrect. We will never see EPROBE_DEFER since we cleared out the gpio. I need to revert this. Same for below. > + if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER) > return -EPROBE_DEFER; > + } > + > + /* > + * The shut-down property is deprecated but needs to be checked for > + * backwards compatibility. > + */ > + if (tas2562->sdz_gpio == NULL) { > + tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shut-down", > + GPIOD_OUT_HIGH); > + if (IS_ERR(tas2562->sdz_gpio)) { > + tas2562->sdz_gpio = NULL; Same comment as above Dan
diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index e74628061040..8a53633a3853 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -680,12 +680,25 @@ static int tas2562_parse_dt(struct tas2562_data *tas2562) struct device *dev = tas2562->dev; int ret = 0; - tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shut-down", - GPIOD_OUT_HIGH); + tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shutdown", + GPIOD_OUT_HIGH); if (IS_ERR(tas2562->sdz_gpio)) { - if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER) { - tas2562->sdz_gpio = NULL; + tas2562->sdz_gpio = NULL; + if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER) return -EPROBE_DEFER; + } + + /* + * The shut-down property is deprecated but needs to be checked for + * backwards compatibility. + */ + if (tas2562->sdz_gpio == NULL) { + tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shut-down", + GPIOD_OUT_HIGH); + if (IS_ERR(tas2562->sdz_gpio)) { + tas2562->sdz_gpio = NULL; + if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER) + return -EPROBE_DEFER; } }
Update the shutdown GPIO property to be shutdown from shut-down. Fixes: c173dba44c2d2 ("ASoC: tas2562: Introduce the TAS2562 amplifier") Signed-off-by: Dan Murphy <dmurphy@ti.com> --- v2 - Set sdz_gpio to NULL if gpio property not present. sound/soc/codecs/tas2562.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)