diff options
| author | Pali Rohár <pali@kernel.org> | 2022-07-25 13:56:11 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2022-07-28 15:17:45 +0200 |
| commit | a1de1035b228f634241c80c60fcb39daae6116f9 (patch) | |
| tree | 0b076c4368a8cdaeca6b14b5a049241ec2f4fd2e | |
| parent | 319b62880cd21c0187081ef5c6b27d888bcbbbe7 (diff) | |
| download | u-boot-a1de1035b228f634241c80c60fcb39daae6116f9.zip u-boot-a1de1035b228f634241c80c60fcb39daae6116f9.tar.gz u-boot-a1de1035b228f634241c80c60fcb39daae6116f9.tar.bz2 | |
pinctrl: Add third argument label for pinctrl_gpio_request() function
This change allows to use pinctrl_gpio_request() function as a direct
pointer for dm_gpio_ops's .request callback.
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | drivers/gpio/gpio-rcar.c | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-uclass.c | 3 | ||||
| -rw-r--r-- | include/dm/pinctrl.h | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index 76f4702..1388018 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -133,7 +133,7 @@ static int rcar_gpio_get_function(struct udevice *dev, unsigned offset) static int rcar_gpio_request(struct udevice *dev, unsigned offset, const char *label) { - return pinctrl_gpio_request(dev, offset); + return pinctrl_gpio_request(dev, offset, label); } static int rcar_gpio_free(struct udevice *dev, unsigned offset) diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 38ce2b5..ce2d5dd 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -222,9 +222,10 @@ pinctrl_gpio_get_pinctrl_and_offset(struct udevice *dev, unsigned offset, * * @dev: GPIO peripheral device * @offset: the GPIO pin offset from the GPIO controller + * @label: the GPIO pin label * @return: 0 on success, or negative error code on failure */ -int pinctrl_gpio_request(struct udevice *dev, unsigned offset) +int pinctrl_gpio_request(struct udevice *dev, unsigned offset, const char *label) { const struct pinctrl_ops *ops; struct udevice *pctldev; diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h index 5436dc4..e3e50afe 100644 --- a/include/dm/pinctrl.h +++ b/include/dm/pinctrl.h @@ -611,10 +611,11 @@ int pinctrl_get_pin_name(struct udevice *dev, int selector, char *buf, * pinctrl_gpio_request() - Request a single pin to be used as GPIO * @dev: GPIO peripheral device * @offset: GPIO pin offset from the GPIO controller + * @label: GPIO label * * Return: 0 on success, or negative error code on failure */ -int pinctrl_gpio_request(struct udevice *dev, unsigned offset); +int pinctrl_gpio_request(struct udevice *dev, unsigned offset, const char *label); /** * pinctrl_gpio_free() - Free a single pin used as GPIO |