6 files changed, 3 insertions, 203 deletions

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index 5a48387d0751..36df5e2c8e07 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -22,13 +22,6 @@ config MIPS_MTX1
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
-config MIPS_BOSPORUS
-        bool "Alchemy Bosporus board"
-        select ALCHEMY_GPIOINT_AU1000
-        select DMA_NONCOHERENT
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-
 config MIPS_DB1000
         bool "Alchemy DB1000 board"
         select ALCHEMY_GPIOINT_AU1000
@@ -71,13 +64,6 @@ config MIPS_DB1550
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
-config MIPS_MIRAGE
-        bool "Alchemy Mirage board"
-        select DMA_NONCOHERENT
-        select ALCHEMY_GPIOINT_AU1000
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-
 config MIPS_PB1100
         bool "Alchemy PB1100 board"
         select ALCHEMY_GPIOINT_AU1000
diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform
index 4e079672f9bf..2920af9c2569 100644
--- a/arch/mips/alchemy/Platform
+++ b/arch/mips/alchemy/Platform
@@ -68,20 +68,6 @@ cflags-$(CONFIG_MIPS_DB1200)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00
 load-$(CONFIG_MIPS_DB1200)      += 0xffffffff80100000
 
 #
-# AMD Alchemy Bosporus eval board
-#
-platform-$(CONFIG_MIPS_BOSPORUS) += alchemy/devboards/
-cflags-$(CONFIG_MIPS_BOSPORUS)   += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_BOSPORUS)     += 0xffffffff80100000
-
-#
-# AMD Alchemy Mirage eval board
-#
-platform-$(CONFIG_MIPS_MIRAGE)  += alchemy/devboards/
-cflags-$(CONFIG_MIPS_MIRAGE)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_MIRAGE)      += 0xffffffff80100000
-
-#
 # 4G-Systems eval board
 #
 platform-$(CONFIG_MIPS_MTX1)    += alchemy/mtx-1/
diff --git a/arch/mips/alchemy/devboards/Makefile b/arch/mips/alchemy/devboards/Makefile
index bea80d787781..5afaf944868f 100644
--- a/arch/mips/alchemy/devboards/Makefile
+++ b/arch/mips/alchemy/devboards/Makefile
@@ -13,5 +13,3 @@ obj-$(CONFIG_MIPS_DB1100)	+= db1x00/
 obj-$(CONFIG_MIPS_DB1200)       += db1200/
 obj-$(CONFIG_MIPS_DB1500)       += db1x00/
 obj-$(CONFIG_MIPS_DB1550)       += db1x00/
-obj-$(CONFIG_MIPS_BOSPORUS)     += db1x00/
-obj-$(CONFIG_MIPS_MIRAGE)       += db1x00/
diff --git a/arch/mips/alchemy/devboards/db1x00/board_setup.c b/arch/mips/alchemy/devboards/db1x00/board_setup.c
index 7cd36e631f6c..8a222b3eba32 100644
--- a/arch/mips/alchemy/devboards/db1x00/board_setup.c
+++ b/arch/mips/alchemy/devboards/db1x00/board_setup.c
@@ -40,64 +40,10 @@
 
 #include <prom.h>
 
-#ifdef CONFIG_MIPS_BOSPORUS
-char irq_tab_alchemy[][5] __initdata = {
-        [11] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, 0xff, 0xff }, /* IDSEL 11 - miniPCI  */
-        [12] = { -1, AU1500_PCI_INTA, 0xff, 0xff, 0xff }, /* IDSEL 12 - SN1741   */
-        [13] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, AU1500_PCI_INTC, AU1500_PCI_INTD }, /* IDSEL 13 - PCI slot */
-};
-
-/*
- * Micrel/Kendin 5 port switch attached to MAC0,
- * MAC0 is associated with PHY address 5 (== WAN port)
- * MAC1 is not associated with any PHY, since it's connected directly
- * to the switch.
- * no interrupts are used
- */
-static struct au1000_eth_platform_data eth0_pdata = {
-        .phy_static_config      = 1,
-        .phy_addr               = 5,
-};
-
-static void bosporus_power_off(void)
-{
-        while (1)
-                asm volatile (".set mips3 ; wait ; .set mips0");
-}
-
-const char *get_system_type(void)
-{
-        return "Alchemy Bosporus Gateway Reference";
-}
-#endif
-
-
-#ifdef CONFIG_MIPS_MIRAGE
-static void mirage_power_off(void)
-{
-        alchemy_gpio_direction_output(210, 1);
-}
-
-const char *get_system_type(void)
-{
-        return "Alchemy Mirage";
-}
-#endif
-
-
-#if defined(CONFIG_MIPS_BOSPORUS) || defined(CONFIG_MIPS_MIRAGE)
-static void mips_softreset(void)
-{
-        asm volatile ("jr\t%0" : : "r"(0xbfc00000));
-}
-
-#else
-
 const char *get_system_type(void)
 {
         return "Alchemy Db1x00";
 }
-#endif
 
 
 void __init board_setup(void)
@@ -116,14 +62,6 @@ void __init board_setup(void)
 #ifdef CONFIG_MIPS_DB1100
         printk(KERN_INFO "AMD Alchemy Au1100/Db1100 Board\n");
 #endif
-#ifdef CONFIG_MIPS_BOSPORUS
-        au1xxx_override_eth_cfg(0, &eth0_pdata);
-
-        printk(KERN_INFO "AMD Alchemy Bosporus Board\n");
-#endif
-#ifdef CONFIG_MIPS_MIRAGE
-        printk(KERN_INFO "AMD Alchemy Mirage Board\n");
-#endif
 #ifdef CONFIG_MIPS_DB1550
         printk(KERN_INFO "AMD Alchemy Au1550/Db1550 Board\n");
 
@@ -150,52 +88,11 @@ void __init board_setup(void)
 
         /* Enable GPIO[31:0] inputs */
         alchemy_gpio1_input_enable();
-
-#ifdef CONFIG_MIPS_MIRAGE
-        {
-                u32 pin_func;
-
-                /* GPIO[20] is output */
-                alchemy_gpio_direction_output(20, 0);
-
-                /* Set GPIO[210:208] instead of SSI_0 */
-                pin_func = au_readl(SYS_PINFUNC) | SYS_PF_S0;
-
-                /* Set GPIO[215:211] for LEDs */
-                pin_func |= 5 << 2;
-
-                /* Set GPIO[214:213] for more LEDs */
-                pin_func |= 5 << 12;
-
-                /* Set GPIO[207:200] instead of PCMCIA/LCD */
-                pin_func |= SYS_PF_LCD | SYS_PF_PC;
-                au_writel(pin_func, SYS_PINFUNC);
-
-                /*
-                 * Enable speaker amplifier.  This should
-                 * be part of the audio driver.
-                 */
-                alchemy_gpio_direction_output(209, 1);
-
-                pm_power_off = mirage_power_off;
-                _machine_halt = mirage_power_off;
-                _machine_restart = (void(*)(char *))mips_softreset;
-        }
-#endif
-
-#ifdef CONFIG_MIPS_BOSPORUS
-        pm_power_off = bosporus_power_off;
-        _machine_halt = bosporus_power_off;
-        _machine_restart = (void(*)(char *))mips_softreset;
-#endif
-        au_sync();
 }
 
 static int __init db1x00_init_irq(void)
 {
-#if defined(CONFIG_MIPS_MIRAGE)
-        irq_set_irq_type(AU1500_GPIO7_INT, IRQF_TRIGGER_RISING); /* TS pendown */
-#elif defined(CONFIG_MIPS_DB1550)
+#if defined(CONFIG_MIPS_DB1550)
         irq_set_irq_type(AU1550_GPIO0_INT, IRQF_TRIGGER_LOW);  /* CD0# */
         irq_set_irq_type(AU1550_GPIO1_INT, IRQF_TRIGGER_LOW);  /* CD1# */
         irq_set_irq_type(AU1550_GPIO3_INT, IRQF_TRIGGER_LOW);  /* CARD0# */
diff --git a/arch/mips/alchemy/devboards/db1x00/platform.c b/arch/mips/alchemy/devboards/db1x00/platform.c
index 9e6b3d442acd..677414d5f5b4 100644
--- a/arch/mips/alchemy/devboards/db1x00/platform.c
+++ b/arch/mips/alchemy/devboards/db1x00/platform.c
@@ -37,7 +37,6 @@ struct pci_dev;
  * Db1550:      0/1, 21/22, 3/5
  */
 
-#define DB1XXX_HAS_PCMCIA
 #define F_SWAPPED (bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1000_SWAPBOOT)
 
 #if defined(CONFIG_MIPS_DB1000)
@@ -48,7 +47,6 @@ struct pci_dev;
 #define DB1XXX_PCMCIA_STSCHG1   AU1000_GPIO4_INT
 #define DB1XXX_PCMCIA_CARD1     AU1000_GPIO5_INT
 #define BOARD_FLASH_SIZE        0x02000000 /* 32MB */
-#define BOARD_FLASH_WIDTH       4 /* 32-bits */
 #elif defined(CONFIG_MIPS_DB1100)
 #define DB1XXX_PCMCIA_CD0       AU1100_GPIO0_INT
 #define DB1XXX_PCMCIA_STSCHG0   AU1100_GPIO1_INT
@@ -57,7 +55,6 @@ struct pci_dev;
 #define DB1XXX_PCMCIA_STSCHG1   AU1100_GPIO4_INT
 #define DB1XXX_PCMCIA_CARD1     AU1100_GPIO5_INT
 #define BOARD_FLASH_SIZE        0x02000000 /* 32MB */
-#define BOARD_FLASH_WIDTH       4 /* 32-bits */
 #elif defined(CONFIG_MIPS_DB1500)
 #define DB1XXX_PCMCIA_CD0       AU1500_GPIO0_INT
 #define DB1XXX_PCMCIA_STSCHG0   AU1500_GPIO1_INT
@@ -66,7 +63,6 @@ struct pci_dev;
 #define DB1XXX_PCMCIA_STSCHG1   AU1500_GPIO4_INT
 #define DB1XXX_PCMCIA_CARD1     AU1500_GPIO5_INT
 #define BOARD_FLASH_SIZE        0x02000000 /* 32MB */
-#define BOARD_FLASH_WIDTH       4 /* 32-bits */
 #elif defined(CONFIG_MIPS_DB1550)
 #define DB1XXX_PCMCIA_CD0       AU1550_GPIO0_INT
 #define DB1XXX_PCMCIA_STSCHG0   AU1550_GPIO21_INT
@@ -75,19 +71,6 @@ struct pci_dev;
 #define DB1XXX_PCMCIA_STSCHG1   AU1550_GPIO22_INT
 #define DB1XXX_PCMCIA_CARD1     AU1550_GPIO5_INT
 #define BOARD_FLASH_SIZE        0x08000000 /* 128MB */
-#define BOARD_FLASH_WIDTH       4 /* 32-bits */
-#else
-/* other board: no PCMCIA */
-#undef DB1XXX_HAS_PCMCIA
-#undef F_SWAPPED
-#define F_SWAPPED 0
-#if defined(CONFIG_MIPS_BOSPORUS)
-#define BOARD_FLASH_SIZE        0x01000000 /* 16MB */
-#define BOARD_FLASH_WIDTH       2 /* 16-bits */
-#elif defined(CONFIG_MIPS_MIRAGE)
-#define BOARD_FLASH_SIZE        0x04000000 /* 64MB */
-#define BOARD_FLASH_WIDTH       4 /* 32-bits */
-#endif
 #endif
 
 #ifdef CONFIG_PCI
@@ -137,52 +120,6 @@ static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
 }
 #endif
 
-#ifdef CONFIG_MIPS_BOSPORUS
-static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
-{
-        if ((slot < 11) || (slot > 13) || pin == 0)
-                return -1;
-        if (slot == 12)
-                return (pin == 1) ? AU1500_PCI_INTA : 0xff;
-        if (slot == 11) {
-                switch (pin) {
-                case 1: return AU1500_PCI_INTA;
-                case 2: return AU1500_PCI_INTB;
-                default: return 0xff;
-                }
-        }
-        if (slot == 13) {
-                switch (pin) {
-                case 1: return AU1500_PCI_INTA;
-                case 2: return AU1500_PCI_INTB;
-                case 3: return AU1500_PCI_INTC;
-                case 4: return AU1500_PCI_INTD;
-                }
-        }
-        return -1;
-}
-#endif
-
-#ifdef CONFIG_MIPS_MIRAGE
-static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
-{
-        if ((slot < 11) || (slot > 13) || pin == 0)
-                return -1;
-        if (slot == 11)
-                return (pin == 1) ? AU1500_PCI_INTD : 0xff;
-        if (slot == 12)
-                return (pin == 3) ? AU1500_PCI_INTC : 0xff;
-        if (slot == 13) {
-                switch (pin) {
-                case 1: return AU1500_PCI_INTA;
-                case 2: return AU1500_PCI_INTB;
-                default: return 0xff;
-                }
-        }
-        return -1;
-}
-#endif
-
 static struct resource alchemy_pci_host_res[] = {
         [0] = {
                 .start  = AU1500_PCI_PHYS_ADDR,
@@ -280,7 +217,6 @@ static struct platform_device db1x00_audio_dev = {
 
 static int __init db1xxx_dev_init(void)
 {
-#ifdef DB1XXX_HAS_PCMCIA
         db1x_register_pcmcia_socket(
                 AU1000_PCMCIA_ATTR_PHYS_ADDR,
                 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
@@ -300,17 +236,15 @@ static int __init db1xxx_dev_init(void)
                 AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,
                 DB1XXX_PCMCIA_CARD1, DB1XXX_PCMCIA_CD1,
                 /*DB1XXX_PCMCIA_STSCHG1*/0, 0, 1);
-#endif
 #ifdef CONFIG_MIPS_DB1100
         platform_device_register(&au1100_lcd_device);
 #endif
-        db1x_register_norflash(BOARD_FLASH_SIZE, BOARD_FLASH_WIDTH, F_SWAPPED);
-
         platform_device_register(&db1x00_codec_dev);
         platform_device_register(&alchemy_ac97c_dma_dev);
         platform_device_register(&alchemy_ac97c_dev);
         platform_device_register(&db1x00_audio_dev);
 
+        db1x_register_norflash(BOARD_FLASH_SIZE, 4 /* 32bit */, F_SWAPPED);
         return 0;
 }
 device_initcall(db1xxx_dev_init);
diff --git a/arch/mips/alchemy/devboards/prom.c b/arch/mips/alchemy/devboards/prom.c
index 56d7ea52fd97..f734833fbdda 100644
--- a/arch/mips/alchemy/devboards/prom.c
+++ b/arch/mips/alchemy/devboards/prom.c
@@ -35,8 +35,7 @@
 
 #if defined(CONFIG_MIPS_DB1000) || \
     defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_DB1100) || \
-    defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_DB1500) || \
-    defined(CONFIG_MIPS_BOSPORUS) || defined(CONFIG_MIPS_MIRAGE)
+    defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_DB1500)
 #define ALCHEMY_BOARD_DEFAULT_MEMSIZE   0x04000000
 
 #else   /* Au1550/Au1200-based develboards */