Reset (aka power off) happens when the reset gpio is made active. Change function name to ak5558_reset to match devicetree property "reset-gpios".
Signed-off-by: Shengjiu Wang shengjiu.wang@nxp.com --- sound/soc/codecs/ak5558.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/sound/soc/codecs/ak5558.c b/sound/soc/codecs/ak5558.c index 8e4dca753f0b..5c3f15827423 100644 --- a/sound/soc/codecs/ak5558.c +++ b/sound/soc/codecs/ak5558.c @@ -318,29 +318,19 @@ static struct snd_soc_dai_driver ak5552_dai = { .ops = &ak5558_dai_ops, };
-static void ak5558_power_off(struct ak5558_priv *ak5558) +static void ak5558_reset(struct ak5558_priv *ak5558, bool active) { - if (!ak5558->reset_gpiod) - return; - - gpiod_set_value_cansleep(ak5558->reset_gpiod, 0); - usleep_range(1000, 2000); -} - -static void ak5558_power_on(struct ak5558_priv *ak5558) -{ - if (!ak5558->reset_gpiod) - return; - - gpiod_set_value_cansleep(ak5558->reset_gpiod, 1); - usleep_range(1000, 2000); + if (ak5558->reset_gpiod) { + gpiod_set_value_cansleep(ak5558->reset_gpiod, active); + usleep_range(1000, 2000); + } }
static int ak5558_probe(struct snd_soc_component *component) { struct ak5558_priv *ak5558 = snd_soc_component_get_drvdata(component);
- ak5558_power_on(ak5558); + ak5558_reset(ak5558, false); return ak5558_set_mcki(component); }
@@ -348,7 +338,7 @@ static void ak5558_remove(struct snd_soc_component *component) { struct ak5558_priv *ak5558 = snd_soc_component_get_drvdata(component);
- ak5558_power_off(ak5558); + ak5558_reset(ak5558, true); }
static int __maybe_unused ak5558_runtime_suspend(struct device *dev) @@ -356,7 +346,7 @@ static int __maybe_unused ak5558_runtime_suspend(struct device *dev) struct ak5558_priv *ak5558 = dev_get_drvdata(dev);
regcache_cache_only(ak5558->regmap, true); - ak5558_power_off(ak5558); + ak5558_reset(ak5558, true);
regulator_bulk_disable(ARRAY_SIZE(ak5558->supplies), ak5558->supplies); @@ -375,8 +365,8 @@ static int __maybe_unused ak5558_runtime_resume(struct device *dev) return ret; }
- ak5558_power_off(ak5558); - ak5558_power_on(ak5558); + ak5558_reset(ak5558, true); + ak5558_reset(ak5558, false);
regcache_cache_only(ak5558->regmap, false); regcache_mark_dirty(ak5558->regmap);