diff options
-rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 2 | ||||
-rw-r--r-- | include/linux/mfd/asic3.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index 2fe0fa0cb383..cccddfe13fa4 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c | |||
@@ -227,7 +227,6 @@ static u16 asic3_gpio_config[] = { | |||
227 | ASIC3_GPIOC0_LED0, /* red */ | 227 | ASIC3_GPIOC0_LED0, /* red */ |
228 | ASIC3_GPIOC1_LED1, /* green */ | 228 | ASIC3_GPIOC1_LED1, /* green */ |
229 | ASIC3_GPIOC2_LED2, /* blue */ | 229 | ASIC3_GPIOC2_LED2, /* blue */ |
230 | ASIC3_GPIOC4_CF_nCD, | ||
231 | ASIC3_GPIOC5_nCIOW, | 230 | ASIC3_GPIOC5_nCIOW, |
232 | ASIC3_GPIOC6_nCIOR, | 231 | ASIC3_GPIOC6_nCIOR, |
233 | ASIC3_GPIOC7_nPCE_1, | 232 | ASIC3_GPIOC7_nPCE_1, |
@@ -241,6 +240,7 @@ static u16 asic3_gpio_config[] = { | |||
241 | ASIC3_GPIOC15_nPIOR, | 240 | ASIC3_GPIOC15_nPIOR, |
242 | 241 | ||
243 | /* GPIOD: input GPIOs, CF */ | 242 | /* GPIOD: input GPIOs, CF */ |
243 | ASIC3_GPIOD4_CF_nCD, | ||
244 | ASIC3_GPIOD11_nCIOIS16, | 244 | ASIC3_GPIOD11_nCIOIS16, |
245 | ASIC3_GPIOD12_nCWAIT, | 245 | ASIC3_GPIOD12_nCWAIT, |
246 | ASIC3_GPIOD15_nPIOW, | 246 | ASIC3_GPIOD15_nPIOW, |
diff --git a/include/linux/mfd/asic3.h b/include/linux/mfd/asic3.h index ed793b77a1c5..ef6faa5cee46 100644 --- a/include/linux/mfd/asic3.h +++ b/include/linux/mfd/asic3.h | |||
@@ -138,6 +138,7 @@ struct asic3_platform_data { | |||
138 | #define ASIC3_GPIOC13_nPWAIT ASIC3_CONFIG_GPIO(45, 1, 1, 0) | 138 | #define ASIC3_GPIOC13_nPWAIT ASIC3_CONFIG_GPIO(45, 1, 1, 0) |
139 | #define ASIC3_GPIOC14_nPIOIS16 ASIC3_CONFIG_GPIO(46, 1, 1, 0) | 139 | #define ASIC3_GPIOC14_nPIOIS16 ASIC3_CONFIG_GPIO(46, 1, 1, 0) |
140 | #define ASIC3_GPIOC15_nPIOR ASIC3_CONFIG_GPIO(47, 1, 0, 0) | 140 | #define ASIC3_GPIOC15_nPIOR ASIC3_CONFIG_GPIO(47, 1, 0, 0) |
141 | #define ASIC3_GPIOD4_CF_nCD ASIC3_CONFIG_GPIO(52, 1, 0, 0) | ||
141 | #define ASIC3_GPIOD11_nCIOIS16 ASIC3_CONFIG_GPIO(59, 1, 0, 0) | 142 | #define ASIC3_GPIOD11_nCIOIS16 ASIC3_CONFIG_GPIO(59, 1, 0, 0) |
142 | #define ASIC3_GPIOD12_nCWAIT ASIC3_CONFIG_GPIO(60, 1, 0, 0) | 143 | #define ASIC3_GPIOD12_nCWAIT ASIC3_CONFIG_GPIO(60, 1, 0, 0) |
143 | #define ASIC3_GPIOD15_nPIOW ASIC3_CONFIG_GPIO(63, 1, 0, 0) | 144 | #define ASIC3_GPIOD15_nPIOW ASIC3_CONFIG_GPIO(63, 1, 0, 0) |