diff options
author | Marek Vasut <marek.vasut@gmail.com> | 2010-07-27 21:48:10 +0200 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-08-05 14:32:45 +0800 |
commit | a9c0629cdefd9c26746ece510fcc88357869685e (patch) | |
tree | 196d0c32e643ee1ce89907ba5d90be94dfcd5e81 /arch/arm/mach-pxa/balloon3.c | |
parent | 12a2449c79686964a36b17175970a8e1c19b4cf7 (diff) | |
download | blackbird-obmc-linux-a9c0629cdefd9c26746ece510fcc88357869685e.tar.gz blackbird-obmc-linux-a9c0629cdefd9c26746ece510fcc88357869685e.zip |
[ARM] pxa/balloon3: PCMCIA Support
This driver adds support for the on-board CF socket.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/balloon3.c')
-rw-r--r-- | arch/arm/mach-pxa/balloon3.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c index 572525c26cac..91ad56d6e929 100644 --- a/arch/arm/mach-pxa/balloon3.c +++ b/arch/arm/mach-pxa/balloon3.c @@ -88,6 +88,18 @@ static unsigned long balloon3_pin_config[] __initdata = { /* USB Host */ GPIO88_USBH1_PWR, GPIO89_USBH1_PEN, + + /* PC Card */ + GPIO48_nPOE, + GPIO49_nPWE, + GPIO50_nPIOR, + GPIO51_nPIOW, + GPIO85_nPCE_1, + GPIO54_nPCE_2, + GPIO79_PSKTSEL, + GPIO55_nPREG, + GPIO56_nPWAIT, + GPIO57_nIOIS16, }; /****************************************************************************** @@ -405,7 +417,6 @@ static void balloon3_irq_handler(unsigned int irq, struct irq_desc *desc) { unsigned long pending = __raw_readl(BALLOON3_INT_CONTROL_REG) & balloon3_irq_enabled; - do { /* clear useless edge notification */ if (desc->chip->ack) |