ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: soc-ac97: Convert to agnostic GPIO API

Browse Source 
The of_gpio.h is going to be removed. In preparation of that convert
the driver to the agnostic API.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230213161713.1450-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko
2023-02-13 18:17:13 +02:00
committed by Mark Brown
parent 0438499a7f
commit 3ee0d39c50
1 changed files with 22 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
sound/soc/soc-ac97.c
View File

@@ -14,10 +14,9 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/gpio.h> #include <linux/gpio/consumer.h>
#include <linux/gpio/driver.h> #include <linux/gpio/driver.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/of_gpio.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/pinctrl/consumer.h> #include <linux/pinctrl/consumer.h>
#include <linux/slab.h> #include <linux/slab.h>
@@ -29,9 +28,9 @@ struct snd_ac97_reset_cfg {
struct pinctrl_state *pstate_reset; struct pinctrl_state *pstate_reset;
struct pinctrl_state *pstate_warm_reset; struct pinctrl_state *pstate_warm_reset;
struct pinctrl_state *pstate_run; struct pinctrl_state *pstate_run;
int gpio_sdata; struct gpio_desc *reset_gpio;
int gpio_sync; struct gpio_desc *sdata_gpio;
int gpio_reset; struct gpio_desc *sync_gpio;
}; };
static struct snd_ac97_bus soc_ac97_bus = { static struct snd_ac97_bus soc_ac97_bus = {
@@ -268,11 +267,11 @@ static void snd_soc_ac97_warm_reset(struct snd_ac97 *ac97)
pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_warm_reset); pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_warm_reset);
gpio_direction_output(snd_ac97_rst_cfg.gpio_sync, 1); gpiod_direction_output_raw(snd_ac97_rst_cfg.sync_gpio, 1);
udelay(10); udelay(10);
gpio_direction_output(snd_ac97_rst_cfg.gpio_sync, 0); gpiod_direction_output_raw(snd_ac97_rst_cfg.sync_gpio, 0);
pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_run); pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_run);
msleep(2); msleep(2);
@@ -284,13 +283,13 @@ static void snd_soc_ac97_reset(struct snd_ac97 *ac97)
pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_reset); pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_reset);
gpio_direction_output(snd_ac97_rst_cfg.gpio_sync, 0); gpiod_direction_output_raw(snd_ac97_rst_cfg.sync_gpio, 0);
gpio_direction_output(snd_ac97_rst_cfg.gpio_sdata, 0); gpiod_direction_output_raw(snd_ac97_rst_cfg.sdata_gpio, 0);
gpio_direction_output(snd_ac97_rst_cfg.gpio_reset, 0); gpiod_direction_output_raw(snd_ac97_rst_cfg.reset_gpio, 0);
udelay(10); udelay(10);
gpio_direction_output(snd_ac97_rst_cfg.gpio_reset, 1); gpiod_direction_output_raw(snd_ac97_rst_cfg.reset_gpio, 1);
pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_run); pinctrl_select_state(pctl, snd_ac97_rst_cfg.pstate_run);
msleep(2); msleep(2);
@@ -301,8 +300,6 @@ static int snd_soc_ac97_parse_pinctl(struct device *dev,
{ {
struct pinctrl *p; struct pinctrl *p;
struct pinctrl_state *state; struct pinctrl_state *state;
int gpio;
int ret;
p = devm_pinctrl_get(dev); p = devm_pinctrl_get(dev);
if (IS_ERR(p)) { if (IS_ERR(p)) {
@@ -332,41 +329,20 @@ static int snd_soc_ac97_parse_pinctl(struct device *dev,
} }
cfg->pstate_run = state; cfg->pstate_run = state;
gpio = of_get_named_gpio(dev->of_node, "ac97-gpios", 0); cfg->sync_gpio = devm_gpiod_get_index(dev, "ac97", 0, GPIOD_ASIS);
if (gpio < 0) { if (IS_ERR(cfg->sync_gpio))
dev_err(dev, "Can't find ac97-sync gpio\n"); return dev_err_probe(dev, PTR_ERR(cfg->sync_gpio), "Can't find ac97-sync gpio\n");
return gpio; gpiod_set_consumer_name(cfg->sync_gpio, "AC97 link sync");
}
ret = devm_gpio_request(dev, gpio, "AC97 link sync");
if (ret) {
dev_err(dev, "Failed requesting ac97-sync gpio\n");
return ret;
}
cfg->gpio_sync = gpio;
gpio = of_get_named_gpio(dev->of_node, "ac97-gpios", 1); cfg->sdata_gpio = devm_gpiod_get_index(dev, "ac97", 1, GPIOD_ASIS);
if (gpio < 0) { if (IS_ERR(cfg->sdata_gpio))
dev_err(dev, "Can't find ac97-sdata gpio %d\n", gpio); return dev_err_probe(dev, PTR_ERR(cfg->sync_gpio), "Can't find ac97-sdata gpio\n");
return gpio; gpiod_set_consumer_name(cfg->sdata_gpio, "AC97 link sdata");
}
ret = devm_gpio_request(dev, gpio, "AC97 link sdata");
if (ret) {
dev_err(dev, "Failed requesting ac97-sdata gpio\n");
return ret;
}
cfg->gpio_sdata = gpio;
gpio = of_get_named_gpio(dev->of_node, "ac97-gpios", 2); cfg->reset_gpio = devm_gpiod_get_index(dev, "ac97", 2, GPIOD_ASIS);
if (gpio < 0) { if (IS_ERR(cfg->reset_gpio))
dev_err(dev, "Can't find ac97-reset gpio\n"); return dev_err_probe(dev, PTR_ERR(cfg->sync_gpio), "Can't find ac97-reset gpio\n");
return gpio; gpiod_set_consumer_name(cfg->reset_gpio, "AC97 link reset");
}
ret = devm_gpio_request(dev, gpio, "AC97 link reset");
if (ret) {
dev_err(dev, "Failed requesting ac97-reset gpio\n");
return ret;
}
cfg->gpio_reset = gpio;
return 0; return 0;
} }