From: Wolfgang Denk <wd@pollux.denx.de>
Date: Mon, 15 May 2006 11:52:51 +0000 (+0200)
Subject: Fix PCMCIA support on virtlab2
X-Git-Tag: LABEL_2006_05_19_1133~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=651652508325cd43a35d724373c51913bf7c11ed;p=u-boot

Fix PCMCIA support on virtlab2
---

diff --git a/CHANGELOG b/CHANGELOG
index 2b42045b2b..1046036c6a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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);