mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-12 05:24:12 +08:00
gpio: tegra: use new pinctrl GPIO helpers
Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
dd4e1f9cd6
commit
f6c54ab976
@ -139,14 +139,14 @@ static void tegra_gpio_disable(struct tegra_gpio_info *tgi, unsigned int gpio)
|
||||
|
||||
static int tegra_gpio_request(struct gpio_chip *chip, unsigned int offset)
|
||||
{
|
||||
return pinctrl_gpio_request(chip->base + offset);
|
||||
return pinctrl_gpio_request_new(chip, offset);
|
||||
}
|
||||
|
||||
static void tegra_gpio_free(struct gpio_chip *chip, unsigned int offset)
|
||||
{
|
||||
struct tegra_gpio_info *tgi = gpiochip_get_data(chip);
|
||||
|
||||
pinctrl_gpio_free(chip->base + offset);
|
||||
pinctrl_gpio_free_new(chip, offset);
|
||||
tegra_gpio_disable(tgi, offset);
|
||||
}
|
||||
|
||||
@ -179,7 +179,7 @@ static int tegra_gpio_direction_input(struct gpio_chip *chip,
|
||||
tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, offset), offset, 0);
|
||||
tegra_gpio_enable(tgi, offset);
|
||||
|
||||
ret = pinctrl_gpio_direction_input(chip->base + offset);
|
||||
ret = pinctrl_gpio_direction_input_new(chip, offset);
|
||||
if (ret < 0)
|
||||
dev_err(tgi->dev,
|
||||
"Failed to set pinctrl input direction of GPIO %d: %d",
|
||||
@ -199,7 +199,7 @@ static int tegra_gpio_direction_output(struct gpio_chip *chip,
|
||||
tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, offset), offset, 1);
|
||||
tegra_gpio_enable(tgi, offset);
|
||||
|
||||
ret = pinctrl_gpio_direction_output(chip->base + offset);
|
||||
ret = pinctrl_gpio_direction_output_new(chip, offset);
|
||||
if (ret < 0)
|
||||
dev_err(tgi->dev,
|
||||
"Failed to set pinctrl output direction of GPIO %d: %d",
|
||||
|
Loading…
Reference in New Issue
Block a user