diff options
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/pinctrl-abx500.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-abx500.h | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/pinctrl-abx500.c index 62bd7cf79a3b..163da9c3ea0e 100644 --- a/drivers/pinctrl/pinctrl-abx500.c +++ b/drivers/pinctrl/pinctrl-abx500.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/bitops.h> | 24 | #include <linux/bitops.h> |
25 | #include <linux/mfd/abx500.h> | 25 | #include <linux/mfd/abx500.h> |
26 | #include <linux/mfd/abx500/ab8500.h> | 26 | #include <linux/mfd/abx500/ab8500.h> |
27 | #include <linux/mfd/abx500/ab8500-gpio.h> | ||
28 | #include <linux/pinctrl/pinctrl.h> | 27 | #include <linux/pinctrl/pinctrl.h> |
29 | #include <linux/pinctrl/consumer.h> | 28 | #include <linux/pinctrl/consumer.h> |
30 | #include <linux/pinctrl/pinmux.h> | 29 | #include <linux/pinctrl/pinmux.h> |
diff --git a/drivers/pinctrl/pinctrl-abx500.h b/drivers/pinctrl/pinctrl-abx500.h index 82293806e842..2beef3bfe9ca 100644 --- a/drivers/pinctrl/pinctrl-abx500.h +++ b/drivers/pinctrl/pinctrl-abx500.h | |||
@@ -15,6 +15,18 @@ enum abx500_pin_func { | |||
15 | ABX500_ALT_C, | 15 | ABX500_ALT_C, |
16 | }; | 16 | }; |
17 | 17 | ||
18 | enum abx500_gpio_pull_updown { | ||
19 | ABX500_GPIO_PULL_DOWN = 0x0, | ||
20 | ABX500_GPIO_PULL_NONE = 0x1, | ||
21 | ABX500_GPIO_PULL_UP = 0x3, | ||
22 | }; | ||
23 | |||
24 | enum abx500_gpio_vinsel { | ||
25 | ABX500_GPIO_VINSEL_VBAT = 0x0, | ||
26 | ABX500_GPIO_VINSEL_VIN_1V8 = 0x1, | ||
27 | ABX500_GPIO_VINSEL_VDD_BIF = 0x2, | ||
28 | }; | ||
29 | |||
18 | /** | 30 | /** |
19 | * struct abx500_function - ABx500 pinctrl mux function | 31 | * struct abx500_function - ABx500 pinctrl mux function |
20 | * @name: The name of the function, exported to pinctrl core. | 32 | * @name: The name of the function, exported to pinctrl core. |