@ -40,7 +40,6 @@ static void cfg_ports (void)
int pcmcia_hardware_enable ( int slot )
{
volatile immap_t * immap ;
volatile cpm8xx_t * cp ;
volatile pcmconf8xx_t * pcmp ;
volatile sysconf8xx_t * sysp ;
uint reg , mask ;
@ -52,7 +51,6 @@ int pcmcia_hardware_enable(int slot)
immap = ( immap_t * ) CONFIG_SYS_IMMR ;
sysp = ( sysconf8xx_t * ) ( & ( ( ( immap_t * ) CONFIG_SYS_IMMR ) - > im_siu_conf ) ) ;
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 */
cfg_ports ( ) ;
@ -98,11 +96,11 @@ int pcmcia_hardware_enable(int slot)
reg ,
( reg & PCMCIA_VS1 ( slot ) ) ? " n " : " ff " ,
( reg & PCMCIA_VS2 ( slot ) ) ? " n " : " ff " ) ;
if ( ( reg & mask ) = = mask ) {
if ( ( reg & mask ) = = mask )
puts ( " 5.0V card found: " ) ;
} else {
else
puts ( " 3.3V card found: " ) ;
}
/* switch VCC on */
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 )
{
volatile immap_t * immap ;
volatile pcmconf8xx_t * pcmp ;
u_long reg ;
debug ( " voltage_set: "
@ -163,8 +159,6 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
" Slot %c, Vcc=%d.%d, Vpp=%d.%d \n " ,
' 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 )
* and assert RESET signal