Unverified Commit f78a9700 authored by Dan Murphy's avatar Dan Murphy Committed by Mark Brown
Browse files

ASoC: tas2562: Update shutdown GPIO property 



Update the shutdown GPIO property to be shutdown from shut-down.

Fixes: c173dba4 ("ASoC: tas2562: Introduce the TAS2562 amplifier")
Signed-off-by: default avatarDan Murphy <dmurphy@ti.com>
Link: https://lore.kernel.org/r/20200723160838.9738-2-dmurphy@ti.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 92e67a9c

sound/soc/codecs/tas2562.c

+18 −5
Original line number Diff line number Diff line
@@ -680,13 +680,26 @@ 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;

		if (PTR_ERR(tas2562->sdz_gpio) == -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",