github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: ak4458: remove "reset-gpios" property handler

Browse Source 
commit c721f189e8 ("reset: Instantiate reset GPIO controller for
shared reset-gpios") check if there is no "resets" property
will fallback to "reset-gpios".

So don't need to handle "reset-gpios" separately in the driver,
the "reset-gpios" handler is duplicated with "resets" control handler,
remove it.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://patch.msgid.link/1720009575-11677-1-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Shengjiu Wang 2024-07-03 20:26:15 +08:00 committed by Mark Brown
parent 6558e8737a
commit 1e0dff741b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/codecs/ak4458.c
View File

@ -45,7 +45,6 @@ struct ak4458_priv {
const struct ak4458_drvdata *drvdata; const struct ak4458_drvdata *drvdata;
struct device *dev; struct device *dev;
struct regmap *regmap; struct regmap *regmap;
struct gpio_desc *reset_gpiod;
struct reset_control *reset; struct reset_control *reset;
struct gpio_desc *mute_gpiod; struct gpio_desc *mute_gpiod;
int digfil; /* SSLOW, SD, SLOW bits */ int digfil; /* SSLOW, SD, SLOW bits */
@ -631,10 +630,7 @@ static struct snd_soc_dai_driver ak4497_dai = {
static void ak4458_reset(struct ak4458_priv *ak4458, bool active) static void ak4458_reset(struct ak4458_priv *ak4458, bool active)
{ {
if (ak4458->reset_gpiod) { if (!IS_ERR_OR_NULL(ak4458->reset)) {
gpiod_set_value_cansleep(ak4458->reset_gpiod, active);
usleep_range(1000, 2000);
} else if (!IS_ERR_OR_NULL(ak4458->reset)) {
if (active) if (active)
reset_control_assert(ak4458->reset); reset_control_assert(ak4458->reset);
else else
@ -758,11 +754,6 @@ static int ak4458_i2c_probe(struct i2c_client *i2c)
if (IS_ERR(ak4458->reset)) if (IS_ERR(ak4458->reset))
return PTR_ERR(ak4458->reset); return PTR_ERR(ak4458->reset);
ak4458->reset_gpiod = devm_gpiod_get_optional(ak4458->dev, "reset",
GPIOD_OUT_LOW);
if (IS_ERR(ak4458->reset_gpiod))
return PTR_ERR(ak4458->reset_gpiod);
ak4458->mute_gpiod = devm_gpiod_get_optional(ak4458->dev, "mute", ak4458->mute_gpiod = devm_gpiod_get_optional(ak4458->dev, "mute",
GPIOD_OUT_LOW); GPIOD_OUT_LOW);
if (IS_ERR(ak4458->mute_gpiod)) if (IS_ERR(ak4458->mute_gpiod))