rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / drivers / pcmcia / tqm8xx_pcmcia.c

diff --git a/drivers/pcmcia/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c
index cc980c2ea3981c650b740551d3f211df0ed7077f..6ba8b5c01ffd03da4b64dc82df5ebb05aec87d22 100644 (file)
--- a/drivers/pcmcia/tqm8xx_pcmcia.c
+++ b/drivers/pcmcia/tqm8xx_pcmcia.c
@@ -40,7 +40,7 @@
 
 static inline void power_config(int slot)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
        /*
         * Configure Port B  pins for
         * 5 Volts Enable and 3 Volts enable
@@ -50,21 +50,21 @@ static inline void power_config(int slot)
 
 static inline void power_off(int slot)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
        /* remove all power */
        immap->im_cpm.cp_pbdat |= 0x00000300;
 }
 
 static inline void power_on_5_0(int slot)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
        immap->im_cpm.cp_pbdat &= ~(0x0000100);
        immap->im_cpm.cp_pbdir |= 0x00000300;
 }
 
 static inline void power_on_3_3(int slot)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
        immap->im_cpm.cp_pbdat &= ~(0x0000200);
        immap->im_cpm.cp_pbdir |= 0x00000300;
 }
@@ -97,7 +97,7 @@ static inline void power_on_3_3(int slot)
 
 static inline void power_config(int slot)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
        /*
        * Configure Port C pins for
        * 5 Volts Enable and 3 Volts enable
@@ -108,20 +108,20 @@ static inline void power_config(int slot)
 
 static inline void power_off(int slot)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
        immap->im_ioport.iop_pcdat &= ~(0x0002 | 0x0004);
 }
 
 static inline void power_on_5_0(int slot)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
        immap->im_ioport.iop_pcdat |= 0x0004;
        immap->im_ioport.iop_pcdir |= (0x0002 | 0x0004);
 }
 
 static inline void power_on_3_3(int slot)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
        immap->im_ioport.iop_pcdat |= 0x0002;
        immap->im_ioport.iop_pcdir |= (0x0002 | 0x0004);
 }
@@ -132,14 +132,14 @@ static inline void power_on_3_3(int slot)
 static inline int check_card_is_absent(int slot)
 {
        volatile pcmconf8xx_t *pcmp =
-               (pcmconf8xx_t *)(&(((immap_t *)CFG_IMMR)->im_pcmcia));
+               (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
        return pcmp->pcmc_pipr & (0x10000000 >> (slot << 4));
 }
 #else
 static inline int check_card_is_absent(int slot)
 {
        volatile pcmconf8xx_t *pcmp =
-               (pcmconf8xx_t *)(&(((immap_t *)CFG_IMMR)->im_pcmcia));
+               (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
        return pcmp->pcmc_pipr & (0x18000000 >> (slot << 4));
 }
 #endif
@@ -153,9 +153,9 @@ static inline int check_card_is_absent(int slot)
 int pcmcia_hardware_enable(int slot)
 {
        volatile pcmconf8xx_t *pcmp =
-               (pcmconf8xx_t *)(&(((immap_t *)CFG_IMMR)->im_pcmcia));
+               (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
        volatile sysconf8xx_t *sysp =
-               (sysconf8xx_t *)(&(((immap_t *)CFG_IMMR)->im_siu_conf));
+               (sysconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_siu_conf));
        uint reg, mask;
 
        debug ("hardware_enable: " PCMCIA_BOARD_MSG " Slot %c\n", 'A'+slot);
@@ -271,7 +271,7 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
        u_long reg;
 # ifdef DEBUG
        volatile pcmconf8xx_t *pcmp =
-               (pcmconf8xx_t *)(&(((immap_t *)CFG_IMMR)->im_pcmcia));
+               (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
 # endif
 
        debug ("voltage_set: " PCMCIA_BOARD_MSG