karo: fdt: fix panel-dpi support

[karo-tx-uboot.git] / drivers / pcmcia / tqm8xx_pcmcia.c

diff --git a/drivers/pcmcia/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c
index dda7d374450a14899d27c072d811fb98a72db175..45dcb54d71de9231ee6bde55a631eb6f5b87c5c2 100644 (file)
--- a/drivers/pcmcia/tqm8xx_pcmcia.c
+++ b/drivers/pcmcia/tqm8xx_pcmcia.c
@@ -20,55 +20,12 @@
 #endif
 
 #if    defined(CONFIG_PCMCIA)  \
-       && (defined(CONFIG_TQM8xxL) || defined(CONFIG_SVM_SC8xx))
+       && defined(CONFIG_TQM8xxL)
 
-#if    defined(CONFIG_VIRTLAB2)
-#define        PCMCIA_BOARD_MSG        "Virtlab2"
-#elif  defined(CONFIG_TQM8xxL)
+#if    defined(CONFIG_TQM8xxL)
 #define        PCMCIA_BOARD_MSG        "TQM8xxL"
-#elif  defined(CONFIG_SVM_SC8xx)
-#define        PCMCIA_BOARD_MSG        "SC8xx"
 #endif
 
-#if    defined(CONFIG_NSCU)
-
-static inline void power_config(int slot) {}
-static inline void power_off(int slot) {}
-static inline void power_on_5_0(int slot) {}
-static inline void power_on_3_3(int slot) {}
-
-#elif  defined(CONFIG_VIRTLAB2)
-
-static inline void power_config(int slot) {}
-
-static inline void power_off(int slot)
-{
-       volatile unsigned __iomem *addr;
-       addr = (volatile unsigned __iomem *)PCMCIA_CTRL;
-
-       out_be32(addr, 0);
-}
-
-static inline void power_on_5_0(int slot)
-{
-       volatile unsigned __iomem *addr;
-       addr = (volatile unsigned __iomem *)PCMCIA_CTRL;
-
-       /* Enable 5V Vccout */
-       out_be32(addr, 2);
-}
-
-static inline void power_on_3_3(int slot)
-{
-       volatile unsigned __iomem *addr;
-       addr = (volatile unsigned __iomem *)PCMCIA_CTRL;
-
-       /* Enable 3.3V Vccout */
-       out_be32(addr, 1);
-}
-
-#else
-
 static inline void power_config(int slot)
 {
        immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
@@ -100,8 +57,6 @@ static inline void power_on_3_3(int slot)
        setbits_be16(&immap->im_ioport.iop_pcdir, 0x0002 | 0x0004);
 }
 
-#endif
-
 /*
  * Function to retrieve the PIPR register, used for debuging purposes.
  */
@@ -123,11 +78,7 @@ static inline int check_card_is_absent(int slot)
        return pipr & (0x18000000 >> (slot << 4));
 }
 
-#ifdef NSCU_OE_INV
-#define        NSCU_GCRX_CXOE  0
-#else
 #define        NSCU_GCRX_CXOE  __MY_PCMCIA_GCRX_CXOE
-#endif
 
 int pcmcia_hardware_enable(int slot)
 {
@@ -245,7 +196,6 @@ int pcmcia_hardware_disable(int slot)
 
 int pcmcia_voltage_set(int slot, int vcc, int vpp)
 {
-#ifndef CONFIG_NSCU
        u_long reg;
        uint32_t pipr = 0;
 
@@ -298,8 +248,7 @@ done:
        udelay(500);
 
        debug("voltage_set: " PCMCIA_BOARD_MSG " Slot %c, DONE\n", slot+'A');
-#endif /* CONFIG_NSCU */
        return 0;
 }
 
-#endif /* CONFIG_PCMCIA && (CONFIG_TQM8xxL || CONFIG_SVM_SC8xx) */
+#endif /* CONFIG_PCMCIA && CONFIG_TQM8xxL */