diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-12-15 23:26:06 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-05 12:08:50 -0500 |
| commit | 5d2a5ef712914fe1c3edfcde78134dc4dc83f461 (patch) | |
| tree | cbef611c664ab229fff50bd5947f563a4cc3a139 /drivers/pcmcia | |
| parent | a2ee47d5f6d010e92e956a8fa9b62fe220d61bf6 (diff) | |
| download | u-boot-imx-5d2a5ef712914fe1c3edfcde78134dc4dc83f461.zip u-boot-imx-5d2a5ef712914fe1c3edfcde78134dc4dc83f461.tar.gz u-boot-imx-5d2a5ef712914fe1c3edfcde78134dc4dc83f461.tar.bz2 | |
mpc8xx: remove FPS{850, 860}L, NSCU, SM850, TK885D, virtlab2 support
These boards are still non-generic boards.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/mpc8xx_pcmcia.c | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/tqm8xx_pcmcia.c | 51 |
2 files changed, 2 insertions, 51 deletions
diff --git a/drivers/pcmcia/mpc8xx_pcmcia.c b/drivers/pcmcia/mpc8xx_pcmcia.c index af77426..ea88494 100644 --- a/drivers/pcmcia/mpc8xx_pcmcia.c +++ b/drivers/pcmcia/mpc8xx_pcmcia.c @@ -58,7 +58,7 @@ static const u_int m8xx_size_to_gray[M8XX_SIZES_NO] = /* -------------------------------------------------------------------- */ -#if defined(CONFIG_LWMON) || defined(CONFIG_NSCU) +#if defined(CONFIG_LWMON) #define CONFIG_SYS_PCMCIA_TIMING ( PCMCIA_SHT(9) \ | PCMCIA_SST(3) \ | PCMCIA_SL(12)) diff --git a/drivers/pcmcia/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c index 8b74478..45dcb54 100644 --- a/drivers/pcmcia/tqm8xx_pcmcia.c +++ b/drivers/pcmcia/tqm8xx_pcmcia.c @@ -22,51 +22,10 @@ #if defined(CONFIG_PCMCIA) \ && 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" #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; @@ -98,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. */ @@ -121,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) { @@ -243,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; @@ -296,7 +248,6 @@ done: udelay(500); debug("voltage_set: " PCMCIA_BOARD_MSG " Slot %c, DONE\n", slot+'A'); -#endif /* CONFIG_NSCU */ return 0; } |