diff options
author | Michael Gernoth <michael@gernoth.net> | 2005-07-26 14:21:47 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-26 14:21:47 -0400 |
commit | 821ca478867433502fc614b4be83e0362cd7e67e (patch) | |
tree | 32253964ca72af1aa97a8df82c72d1a9be6d074e /drivers/pcmcia/sa1100_jornada720.c | |
parent | 7fcc113c3021a42db90e1ad27a7bec267b6e13e3 (diff) |
[PATCH] ARM: 2830/1: Fix Jornada 720 PCMCIA-support
Patch from Michael Gernoth
This patch lets the Jornada 720 PCMCIA-driver compile again. The
resulting driver has been tested on a Jornada with a CF-card, which
was mounted and accessed successfully.
Signed-off-by: Michael Gernoth <michael@gernoth.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/sa1100_jornada720.c')
-rw-r--r-- | drivers/pcmcia/sa1100_jornada720.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1100_jornada720.c index 0a387106acb0..7a87298bae99 100644 --- a/drivers/pcmcia/sa1100_jornada720.c +++ b/drivers/pcmcia/sa1100_jornada720.c | |||
@@ -30,20 +30,9 @@ static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt) | |||
30 | */ | 30 | */ |
31 | GRER |= 0x00000002; | 31 | GRER |= 0x00000002; |
32 | /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */ | 32 | /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */ |
33 | PA_DDR = 0; | 33 | sa1111_set_io_dir(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0); |
34 | PA_DWR = 0; | 34 | sa1111_set_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0); |
35 | PA_SDR = 0; | 35 | sa1111_set_sleep_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0); |
36 | PA_SSR = 0; | ||
37 | |||
38 | PB_DDR = 0; | ||
39 | PB_DWR = 0x01; | ||
40 | PB_SDR = 0; | ||
41 | PB_SSR = 0; | ||
42 | |||
43 | PC_DDR = 0x88; | ||
44 | PC_DWR = 0x20; | ||
45 | PC_SDR = 0; | ||
46 | PC_SSR = 0; | ||
47 | 36 | ||
48 | return sa1111_pcmcia_hw_init(skt); | 37 | return sa1111_pcmcia_hw_init(skt); |
49 | } | 38 | } |
@@ -95,7 +84,7 @@ printk("%s(): config socket %d vcc %d vpp %d\n", __FUNCTION__, | |||
95 | unsigned long flags; | 84 | unsigned long flags; |
96 | 85 | ||
97 | local_irq_save(flags); | 86 | local_irq_save(flags); |
98 | PA_DWR = (PA_DWR & ~pa_dwr_mask) | pa_dwr_set; | 87 | sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set); |
99 | local_irq_restore(flags); | 88 | local_irq_restore(flags); |
100 | } | 89 | } |
101 | 90 | ||