Fix PCMCIA support on virtlab2

This commit is contained in:
Wolfgang Denk 2006-05-15 13:52:51 +02:00
parent 319b9a5467
commit 6516525083
2 changed files with 9 additions and 0 deletions

View File

@ -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).

View File

@ -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);