diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-05-15 13:52:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-05-15 13:52:51 +0200 |
| commit | 651652508325cd43a35d724373c51913bf7c11ed (patch) | |
| tree | 2643d58eee3e3b980544f029fcac9f6449e64a9a | |
| parent | 319b9a54670c9adf4bb84a7dacd2b031350f4066 (diff) | |
Fix PCMCIA support on virtlab2
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | common/cmd_pcmcia.c | 7 |
2 files changed, 9 insertions, 0 deletions
@@ -2,6 +2,8 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Fix PCMCIA support on virtlab2 + * Add support for VirtLab2 board (needed because of differences in the PCMCIA hardware). diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c index 46b703d163..8e3e84bed9 100644 --- a/common/cmd_pcmcia.c +++ b/common/cmd_pcmcia.c @@ -1035,12 +1035,19 @@ static int hardware_enable(int slot) (pcmconf8xx_t *)&(((immap_t *)CFG_IMMR)->im_pcmcia); volatile unsigned char *powerctl = (volatile unsigned char *)PCMCIA_CTRL; + volatile sysconf8xx_t *sysp = + (sysconf8xx_t *)(&(((immap_t *)CFG_IMMR)->im_siu_conf)); unsigned int reg, mask; debug ("hardware_enable: " PCMCIA_BOARD_MSG " Slot %c\n", 'A'+slot); udelay(10000); + /* + * Configure SIUMCR to enable PCMCIA port B + */ + sysp->sc_siumcr &= ~SIUMCR_DBGC11; /* set DBGC to 00 */ + /* clear interrupt state, and disable interrupts */ pcmp->pcmc_pscr = PCMCIA_MASK(slot); pcmp->pcmc_per &= ~PCMCIA_MASK(slot); |