| From 1bbf3501f71f2e0aa1e72e0cd3c9c9aba9a590dd Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 1 Dec 2023 14:20:31 +0100 |
| Subject: ASoC: cs35l33: Fix GPIO name and drop legacy include |
| |
| From: Linus Walleij <linus.walleij@linaro.org> |
| |
| [ Upstream commit 50678d339d670a92658e5538ebee30447c88ccb3 ] |
| |
| This driver includes the legacy GPIO APIs <linux/gpio.h> and |
| <linux/of_gpio.h> but does not use any symbols from any of |
| them. |
| |
| Drop the includes. |
| |
| Further the driver is requesting "reset-gpios" rather than |
| just "reset" from the GPIO framework. This is wrong because |
| the gpiolib core will add "-gpios" before processing the |
| request from e.g. device tree. Drop the suffix. |
| |
| The last problem means that the optional RESET GPIO has |
| never been properly retrieved and used even if it existed, |
| but nobody noticed. |
| |
| Fixes: 3333cb7187b9 ("ASoC: cs35l33: Initial commit of the cs35l33 CODEC driver.") |
| Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Link: https://lore.kernel.org/r/20231201-descriptors-sound-cirrus-v2-2-ee9f9d4655eb@linaro.org |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/codecs/cs35l33.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c |
| index 8894369e329a..87b299d24bd8 100644 |
| --- a/sound/soc/codecs/cs35l33.c |
| +++ b/sound/soc/codecs/cs35l33.c |
| @@ -22,13 +22,11 @@ |
| #include <sound/soc-dapm.h> |
| #include <sound/initval.h> |
| #include <sound/tlv.h> |
| -#include <linux/gpio.h> |
| #include <linux/gpio/consumer.h> |
| #include <sound/cs35l33.h> |
| #include <linux/pm_runtime.h> |
| #include <linux/regulator/consumer.h> |
| #include <linux/regulator/machine.h> |
| -#include <linux/of_gpio.h> |
| #include <linux/of.h> |
| #include <linux/of_device.h> |
| #include <linux/of_irq.h> |
| @@ -1168,7 +1166,7 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client, |
| |
| /* We could issue !RST or skip it based on AMP topology */ |
| cs35l33->reset_gpio = devm_gpiod_get_optional(&i2c_client->dev, |
| - "reset-gpios", GPIOD_OUT_HIGH); |
| + "reset", GPIOD_OUT_HIGH); |
| if (IS_ERR(cs35l33->reset_gpio)) { |
| dev_err(&i2c_client->dev, "%s ERROR: Can't get reset GPIO\n", |
| __func__); |
| -- |
| 2.43.0 |
| |
