diff options
| author | Tom Rini <[email protected]> | 2022-07-29 08:08:33 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-07-29 08:08:33 -0400 |
| commit | 12fc2c3898cbcf6713055b58bd6103a2b9fda0de (patch) | |
| tree | 8c6ee3bbcb0c078f43b4286c097b929523454c14 /include | |
| parent | 87069c79e830b2ab909537946a1e1db0e5fe7d8c (diff) | |
| parent | b2d7619e46aa414cba14a1705892b7e249468d6f (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: Add Armada 38x pin muxing support (Pali)
- a37xx: pinctrl: Fix requesting GPIOs and pinmux command (Pali)
- mvebu: pinctrl: apply SDHCI PHY config for A7K (Kosta)
- gpio: Add Turris Omnia MCU driver (Pali)
- cmd: mvebu/bubt: Improvements for image verification (Pali)
- mvebu: turris_omnia: Fix mpp26 pin name and comment (Marek)
Diffstat (limited to 'include')
| -rw-r--r-- | include/dm/pinctrl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h index a09b242fd99..e3e50afeaff 100644 --- a/include/dm/pinctrl.h +++ b/include/dm/pinctrl.h @@ -491,6 +491,8 @@ enum pin_config_param { * Return: 0 on success, or negative error code on failure */ int pinctrl_generic_set_state(struct udevice *pctldev, struct udevice *config); +int pinctrl_generic_set_state_prefix(struct udevice *pctldev, struct udevice *config, + const char *prefix); #else static inline int pinctrl_generic_set_state(struct udevice *pctldev, struct udevice *config) @@ -609,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 |