diff options
author | Paul Parsons <lost.distance@yahoo.com> | 2012-05-02 11:49:29 -0400 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@gmail.com> | 2012-05-02 21:55:30 -0400 |
commit | 1334d86b55d2ec1b50fdcb440c2642ae7a4620ba (patch) | |
tree | a7518d0ce00bd316aa4ecdac31ff76a316193cc3 /arch/arm/mach-pxa | |
parent | e949f93c591352f0376fdd192b4060a38c102ba5 (diff) |
ARM: pxa: hx4700: Add PCMCIA/CF support
This patch is part of a set which adds PCMCIA/CF support for the hx4700.
This patch modifies asic3_gpio_config[] as follows:
1. Remove ASIC3_GPIOC4_CF_nCD, whose purpose is unknown.
2. Add ASIC3_GPIOD4_CF_nCD, the actual CF card detect GPIO.
Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 2 |
1 files changed, 1 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, |