Unverified Commit d5099bc1 authored by Peng Fan's avatar Peng Fan Committed by Mark Brown
Browse files

ASoC: codec: wcd9335: Convert to GPIO descriptors 



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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
Link: https://patch.msgid.link/20250324-wcd-gpiod-v2-3-773f67ce3b56@nxp.com


Reviewed-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c2d359b4

sound/soc/codecs/wcd9335.c

+7 −8
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <sound/soc.h>

#include <sound/pcm_params.h>

#include <sound/soc-dapm.h>

#include <linux/of_gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <sound/tlv.h>
@@ -331,7 +331,7 @@ struct wcd9335_codec { 
	int comp_enabled[COMPANDER_MAX];



	int intr1;

	int reset_gpio;

	struct gpio_desc *reset_gpio;

	struct regulator_bulk_data supplies[WCD9335_MAX_SUPPLY];



	unsigned int rx_port_value[WCD9335_RX_MAX];
@@ -4975,12 +4975,11 @@ static const struct regmap_irq_chip wcd9335_regmap_irq1_chip = { 
static int wcd9335_parse_dt(struct wcd9335_codec *wcd)

{

	struct device *dev = wcd->dev;

	struct device_node *np = dev->of_node;

	int ret;



	wcd->reset_gpio = of_get_named_gpio(np,	"reset-gpios", 0);

	if (wcd->reset_gpio < 0)

		return dev_err_probe(dev, wcd->reset_gpio, "Reset GPIO missing from DT\n");

	wcd->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);

	if (IS_ERR(wcd->reset_gpio))

		return dev_err_probe(dev, PTR_ERR(wcd->reset_gpio), "Reset GPIO missing from DT\n");



	wcd->mclk = devm_clk_get(dev, "mclk");

	if (IS_ERR(wcd->mclk))
@@ -5023,9 +5022,9 @@ static int wcd9335_power_on_reset(struct wcd9335_codec *wcd) 
	 */

	usleep_range(600, 650);



	gpio_direction_output(wcd->reset_gpio, 0);

	gpiod_set_value(wcd->reset_gpio, 1);

	msleep(20);

	gpio_set_value(wcd->reset_gpio, 1);

	gpiod_set_value(wcd->reset_gpio, 0);

	msleep(20);



	return 0;