GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

board/manroland/uc100/pcmcia.c: Fix GCC 4.6 build warnings

Browse source 
Fix:
pcmcia.c: In function 'pcmcia_voltage_set':
pcmcia.c:158:25: warning: variable 'pcmp' set but not used
[-Wunused-but-set-variable]
pcmcia.c:157:20: warning: variable 'immap' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-11-04 15:55:27 +00:00
parent 700a3748a6
commit 561d01a5ee
1 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
board/manroland/uc100/pcmcia.c
View file

@ -27,8 +27,8 @@ static void cfg_ports (void)
immap = (immap_t *)CONFIG_SYS_IMMR; immap = (immap_t *)CONFIG_SYS_IMMR;
/* /*
* Configure Port A for MAX1602 PC-Card Power-Interface Switch * Configure Port A for MAX1602 PC-Card Power-Interface Switch
*/ */
immap->im_ioport.iop_padat &= ~0x8000; /* set port x output to low */ immap->im_ioport.iop_padat &= ~0x8000; /* set port x output to low */
immap->im_ioport.iop_padir |= 0x8000; /* enable port x as output */ immap->im_ioport.iop_padir |= 0x8000; /* enable port x as output */
@ -40,7 +40,6 @@ static void cfg_ports (void)
int pcmcia_hardware_enable(int slot) int pcmcia_hardware_enable(int slot)
{ {
volatile immap_t *immap; volatile immap_t *immap;
volatile cpm8xx_t *cp;
volatile pcmconf8xx_t *pcmp; volatile pcmconf8xx_t *pcmp;
volatile sysconf8xx_t *sysp; volatile sysconf8xx_t *sysp;
uint reg, mask; uint reg, mask;
@ -52,15 +51,14 @@ int pcmcia_hardware_enable(int slot)
immap = (immap_t *)CONFIG_SYS_IMMR; immap = (immap_t *)CONFIG_SYS_IMMR;
sysp = (sysconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_siu_conf)); sysp = (sysconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_siu_conf));
pcmp = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia)); pcmp = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
cp = (cpm8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_cpm));
/* Configure Ports for TPS2211A PC-Card Power-Interface Switch */ /* Configure Ports for TPS2211A PC-Card Power-Interface Switch */
cfg_ports (); cfg_ports ();
/* /*
* Configure SIUMCR to enable PCMCIA port B * Configure SIUMCR to enable PCMCIA port B
* (VFLS[0:1] are not used for debugging, we connect FRZ# instead) * (VFLS[0:1] are not used for debugging, we connect FRZ# instead)
*/ */
sysp->sc_siumcr &= ~SIUMCR_DBGC11; /* set DBGC to 00 */ sysp->sc_siumcr &= ~SIUMCR_DBGC11; /* set DBGC to 00 */
/* clear interrupt state, and disable interrupts */ /* clear interrupt state, and disable interrupts */
@ -68,9 +66,9 @@ int pcmcia_hardware_enable(int slot)
pcmp->pcmc_per &= ~PCMCIA_MASK(_slot_); pcmp->pcmc_per &= ~PCMCIA_MASK(_slot_);
/* /*
* Disable interrupts, DMA, and PCMCIA buffers * Disable interrupts, DMA, and PCMCIA buffers
* (isolate the interface) and assert RESET signal * (isolate the interface) and assert RESET signal
*/ */
debug ("Disable PCMCIA buffers and assert RESET\n"); debug ("Disable PCMCIA buffers and assert RESET\n");
reg = 0; reg = 0;
reg |= __MY_PCMCIA_GCRX_CXRESET; /* active high */ reg |= __MY_PCMCIA_GCRX_CXRESET; /* active high */
@ -78,8 +76,8 @@ int pcmcia_hardware_enable(int slot)
udelay(500); udelay(500);
/* /*
* Make sure there is a card in the slot, then configure the interface. * Make sure there is a card in the slot, then configure the interface.
*/ */
udelay(10000); udelay(10000);
debug ("[%d] %s: PIPR(%p)=0x%x\n", debug ("[%d] %s: PIPR(%p)=0x%x\n",
__LINE__,__FUNCTION__, __LINE__,__FUNCTION__,
@ -90,19 +88,19 @@ int pcmcia_hardware_enable(int slot)
} }
/* /*
* Power On. * Power On.
*/ */
mask = PCMCIA_VS1(slot) | PCMCIA_VS2(slot); mask = PCMCIA_VS1(slot) | PCMCIA_VS2(slot);
reg = pcmp->pcmc_pipr; reg = pcmp->pcmc_pipr;
debug ("PIPR: 0x%x ==> VS1=o%s, VS2=o%s\n", debug ("PIPR: 0x%x ==> VS1=o%s, VS2=o%s\n",
reg, reg,
(reg&PCMCIA_VS1(slot))?"n":"ff", (reg&PCMCIA_VS1(slot))?"n":"ff",
(reg&PCMCIA_VS2(slot))?"n":"ff"); (reg&PCMCIA_VS2(slot))?"n":"ff");
if ((reg & mask) == mask) {
if ((reg & mask) == mask)
puts (" 5.0V card found: "); puts (" 5.0V card found: ");
} else { else
puts (" 3.3V card found: "); puts (" 3.3V card found: ");
}
/* switch VCC on */ /* switch VCC on */
immap->im_ioport.iop_padat |= 0x8000; /* power enable 3.3V */ immap->im_ioport.iop_padat |= 0x8000; /* power enable 3.3V */
@ -154,8 +152,6 @@ int pcmcia_hardware_disable(int slot)
int pcmcia_voltage_set(int slot, int vcc, int vpp) int pcmcia_voltage_set(int slot, int vcc, int vpp)
{ {
volatile immap_t *immap;
volatile pcmconf8xx_t *pcmp;
u_long reg; u_long reg;
debug ("voltage_set: " debug ("voltage_set: "
@ -163,12 +159,10 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
" Slot %c, Vcc=%d.%d, Vpp=%d.%d\n", " Slot %c, Vcc=%d.%d, Vpp=%d.%d\n",
'A'+slot, vcc/10, vcc%10, vpp/10, vcc%10); 'A'+slot, vcc/10, vcc%10, vpp/10, vcc%10);
immap = (immap_t *)CONFIG_SYS_IMMR;
pcmp = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
/* /*
* Disable PCMCIA buffers (isolate the interface) * Disable PCMCIA buffers (isolate the interface)
* and assert RESET signal * and assert RESET signal
*/ */
debug ("Disable PCMCIA buffers and assert RESET\n"); debug ("Disable PCMCIA buffers and assert RESET\n");
reg = PCMCIA_PGCRX(_slot_); reg = PCMCIA_PGCRX(_slot_);
reg |= __MY_PCMCIA_GCRX_CXRESET; /* active high */ reg |= __MY_PCMCIA_GCRX_CXRESET; /* active high */
@ -176,10 +170,10 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
udelay(500); udelay(500);
/* /*
* Configure Port C pins for * Configure Port C pins for
* 5 Volts Enable and 3 Volts enable, * 5 Volts Enable and 3 Volts enable,
* Turn all power pins to Hi-Z * Turn all power pins to Hi-Z
*/ */
debug ("PCMCIA power OFF\n"); debug ("PCMCIA power OFF\n");
cfg_ports (); /* Enables switch, but all in Hi-Z */ cfg_ports (); /* Enables switch, but all in Hi-Z */