iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: tas2562: Update shutdown GPIO property

Browse Source 
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>
Link: https://lore.kernel.org/r/20200723160838.9738-2-dmurphy@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Dan Murphy 2020-07-23 11:08:38 -05:00 committed by Mark Brown
parent 92e67a9c4f
commit f78a97003b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/soc/codecs/tas2562.c
View File

@ -680,13 +680,26 @@ static int tas2562_parse_dt(struct tas2562_data *tas2562)
struct device *dev = tas2562->dev; struct device *dev = tas2562->dev;
int ret = 0; int ret = 0;
tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shut-down", tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shutdown", GPIOD_OUT_HIGH);
GPIOD_OUT_HIGH);
if (IS_ERR(tas2562->sdz_gpio)) { if (IS_ERR(tas2562->sdz_gpio)) {
if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER) { if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER)
tas2562->sdz_gpio = NULL;
return -EPROBE_DEFER; return -EPROBE_DEFER;
}
tas2562->sdz_gpio = NULL;
}
/*
* 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))
if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER)
return -EPROBE_DEFER;
tas2562->sdz_gpio = NULL;
} }
ret = fwnode_property_read_u32(dev->fwnode, "ti,imon-slot-no", ret = fwnode_property_read_u32(dev->fwnode, "ti,imon-slot-no",