diff options
author | Patrice Chotard <patrice.chotard@st.com> | 2013-01-08 04:41:02 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-01-30 14:42:14 -0500 |
commit | 0493e6493031523f78680b4469f02fc1b2d440f3 (patch) | |
tree | 06f03b57fa707ac4423fa17749d818a710859ef3 /include/linux/mfd | |
parent | a718ff6f9bbc13ba3677589f7fd241066554424f (diff) |
pinctrl: add abx500 pinctrl driver core
This adds the AB8500 core driver, which will be utilized by
the follow-on drivers for different ABx500 variants.
Sselect the driver from the DBX500_SOC, as this chip is
powering and clocking that SoC.
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/abx500/ab8500-gpio.h | 15 | ||||
-rw-r--r-- | include/linux/mfd/abx500/ab8500.h | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/include/linux/mfd/abx500/ab8500-gpio.h b/include/linux/mfd/abx500/ab8500-gpio.h index 2387c207ea86..e8c8281e194a 100644 --- a/include/linux/mfd/abx500/ab8500-gpio.h +++ b/include/linux/mfd/abx500/ab8500-gpio.h | |||
@@ -14,10 +14,21 @@ | |||
14 | * registers. | 14 | * registers. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | struct ab8500_gpio_platform_data { | 17 | struct abx500_gpio_platform_data { |
18 | int gpio_base; | 18 | int gpio_base; |
19 | u32 irq_base; | 19 | u32 irq_base; |
20 | u8 config_reg[8]; | 20 | }; |
21 | |||
22 | enum abx500_gpio_pull_updown { | ||
23 | ABX500_GPIO_PULL_DOWN = 0x0, | ||
24 | ABX500_GPIO_PULL_NONE = 0x1, | ||
25 | ABX500_GPIO_PULL_UP = 0x3, | ||
26 | }; | ||
27 | |||
28 | enum abx500_gpio_vinsel { | ||
29 | ABX500_GPIO_VINSEL_VBAT = 0x0, | ||
30 | ABX500_GPIO_VINSEL_VIN_1V8 = 0x1, | ||
31 | ABX500_GPIO_VINSEL_VDD_BIF = 0x2, | ||
21 | }; | 32 | }; |
22 | 33 | ||
23 | #endif /* _AB8500_GPIO_H */ | 34 | #endif /* _AB8500_GPIO_H */ |
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h index e640ea059be2..fc0534483c72 100644 --- a/include/linux/mfd/abx500/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h | |||
@@ -385,7 +385,7 @@ struct ab8500_platform_data { | |||
385 | struct ab8500_regulator_reg_init *regulator_reg_init; | 385 | struct ab8500_regulator_reg_init *regulator_reg_init; |
386 | int num_regulator; | 386 | int num_regulator; |
387 | struct regulator_init_data *regulator; | 387 | struct regulator_init_data *regulator; |
388 | struct ab8500_gpio_platform_data *gpio; | 388 | struct abx500_gpio_platform_data *gpio; |
389 | struct ab8500_codec_platform_data *codec; | 389 | struct ab8500_codec_platform_data *codec; |
390 | }; | 390 | }; |
391 | 391 | ||