mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gpio: aspeed: use new pinctrl GPIO helpers

Browse source 
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>
Reviewed-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Bartosz Golaszewski 2023-10-03 09:41:14 +02:00
parent 9626b3d74d
commit 09a88bed64
1 changed files with 3 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpio/gpio-aspeed.c
View file

@ -750,12 +750,12 @@ static int aspeed_gpio_request(struct gpio_chip *chip, unsigned int offset)
if (!have_gpio(gpiochip_get_data(chip), offset)) if (!have_gpio(gpiochip_get_data(chip), offset))
return -ENODEV; return -ENODEV;
return pinctrl_gpio_request(chip->base + offset); return pinctrl_gpio_request_new(chip, offset);
} }
static void aspeed_gpio_free(struct gpio_chip *chip, unsigned int offset) static void aspeed_gpio_free(struct gpio_chip *chip, unsigned int offset)
{ {
pinctrl_gpio_free(chip->base + offset); pinctrl_gpio_free_new(chip, offset);
} }
static int usecs_to_cycles(struct aspeed_gpio *gpio, unsigned long usecs, static int usecs_to_cycles(struct aspeed_gpio *gpio, unsigned long usecs,
@ -973,7 +973,7 @@ static int aspeed_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
else if (param == PIN_CONFIG_BIAS_DISABLE || else if (param == PIN_CONFIG_BIAS_DISABLE ||
param == PIN_CONFIG_BIAS_PULL_DOWN || param == PIN_CONFIG_BIAS_PULL_DOWN ||
param == PIN_CONFIG_DRIVE_STRENGTH) param == PIN_CONFIG_DRIVE_STRENGTH)
return pinctrl_gpio_set_config(chip->base + offset, config); return pinctrl_gpio_set_config_new(chip, offset, config);
else if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN || else if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN ||
param == PIN_CONFIG_DRIVE_OPEN_SOURCE) param == PIN_CONFIG_DRIVE_OPEN_SOURCE)
/* Return -ENOTSUPP to trigger emulation, as per datasheet */ /* Return -ENOTSUPP to trigger emulation, as per datasheet */