samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: codec: wcd9335: Convert to GPIO descriptors

Browse Source 
[ Upstream commit d5099bc1b56417733f4cccf10c61ee74dadd5562 ]

of_gpio.h is deprecated, update the driver to use GPIO descriptors.
- Use dev_gpiod_get to get GPIO descriptor.
- Use gpiod_set_value to configure output value.

With legacy of_gpio API, the driver set gpio value 0 to assert reset,
and 1 to deassert reset. And the reset-gpios use GPIO_ACTIVE_LOW flag in
DTS, so set GPIOD_OUT_LOW when get GPIO descriptors, and set value 1 means
output low, set value 0 means output high with gpiod API.

The in-tree DTS files have the right polarity set up already so we can
expect this to "just work"

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://patch.msgid.link/20250324-wcd-gpiod-v2-3-773f67ce3b56@nxp.com
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: 9079db287fc3 ("ASoC: codecs: wcd9335: Fix missing free of regulator supplies")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Peng Fan
2025-03-24 19:51:29 +08:00
committed by Greg Kroah-Hartman
parent 99d6968422
commit 28b6ef1ab6
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/codecs/wcd9335.c
View File

@@ -16,7 +16,7 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
#include <linux/of_gpio.h> #include <linux/gpio/consumer.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <sound/tlv.h> #include <sound/tlv.h>
@@ -329,7 +329,7 @@ struct wcd9335_codec {
int comp_enabled[COMPANDER_MAX]; int comp_enabled[COMPANDER_MAX];
int intr1; int intr1;
int reset_gpio; struct gpio_desc *reset_gpio;
struct regulator_bulk_data supplies[WCD9335_MAX_SUPPLY]; struct regulator_bulk_data supplies[WCD9335_MAX_SUPPLY];
unsigned int rx_port_value[WCD9335_RX_MAX]; unsigned int rx_port_value[WCD9335_RX_MAX];
@@ -5032,12 +5032,11 @@ static const struct regmap_irq_chip wcd9335_regmap_irq1_chip = {
static int wcd9335_parse_dt(struct wcd9335_codec *wcd) static int wcd9335_parse_dt(struct wcd9335_codec *wcd)
{ {
struct device *dev = wcd->dev; struct device *dev = wcd->dev;
struct device_node *np = dev->of_node;
int ret; int ret;
wcd->reset_gpio = of_get_named_gpio(np, "reset-gpios", 0); wcd->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
if (wcd->reset_gpio < 0) if (IS_ERR(wcd->reset_gpio))
return dev_err_probe(dev, wcd->reset_gpio, "Reset GPIO missing from DT\n"); return dev_err_probe(dev, PTR_ERR(wcd->reset_gpio), "Reset GPIO missing from DT\n");
wcd->mclk = devm_clk_get(dev, "mclk"); wcd->mclk = devm_clk_get(dev, "mclk");
if (IS_ERR(wcd->mclk)) if (IS_ERR(wcd->mclk))
@@ -5080,9 +5079,9 @@ static int wcd9335_power_on_reset(struct wcd9335_codec *wcd)
*/ */
usleep_range(600, 650); usleep_range(600, 650);
gpio_direction_output(wcd->reset_gpio, 0); gpiod_set_value(wcd->reset_gpio, 1);
msleep(20); msleep(20);
gpio_set_value(wcd->reset_gpio, 1); gpiod_set_value(wcd->reset_gpio, 0);
msleep(20); msleep(20);
return 0; return 0;