MIPS: Alchemy: remove PB1000 support

Noone seems to have test hardware or care anymore.  Drop PB1000 support
and along with it the old Alchemy PCMCIA socket driver.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
Cc: linux-pcmcia@lists.infradead.org
Patchwork: https://patchwork.linux-mips.org/patch/2881/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

7 files changed, 1 insertions, 246 deletions

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index 2a68be6a1b97..5a48387d0751 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -78,15 +78,6 @@ config MIPS_MIRAGE
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
-config MIPS_PB1000
-        bool "Alchemy PB1000 board"
-        select ALCHEMY_GPIOINT_AU1000
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select SWAP_IO_SPACE
-        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 96e9e41f1b2a..4e079672f9bf 100644
--- a/arch/mips/alchemy/Platform
+++ b/arch/mips/alchemy/Platform
@@ -5,13 +5,6 @@ platform-$(CONFIG_MIPS_ALCHEMY)	+= alchemy/common/
 
 
 #
-# AMD Alchemy Pb1000 eval board
-#
-platform-$(CONFIG_MIPS_PB1000)  += alchemy/devboards/
-cflags-$(CONFIG_MIPS_PB1000)    += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
-load-$(CONFIG_MIPS_PB1000)      += 0xffffffff80100000
-
-#
 # AMD Alchemy Pb1100 eval board
 #
 platform-$(CONFIG_MIPS_PB1100)  += alchemy/devboards/
diff --git a/arch/mips/alchemy/common/irq.c b/arch/mips/alchemy/common/irq.c
index 8b60ba0675e2..2a94a64b7333 100644
--- a/arch/mips/alchemy/common/irq.c
+++ b/arch/mips/alchemy/common/irq.c
@@ -35,9 +35,6 @@
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
 #include <asm/mach-au1x00/au1000.h>
-#ifdef CONFIG_MIPS_PB1000
-#include <asm/mach-pb1x00/pb1000.h>
-#endif
 
 /* Interrupt Controller register offsets */
 #define IC_CFG0RD       0x40
@@ -265,14 +262,6 @@ static void au1x_ic1_unmask(struct irq_data *d)
 
         __raw_writel(1 << bit, base + IC_MASKSET);
         __raw_writel(1 << bit, base + IC_WAKESET);
-
-/* very hacky. does the pb1000 cpld auto-disable this int?
- * nowhere in the current kernel sources is it disabled.        --mlau
- */
-#if defined(CONFIG_MIPS_PB1000)
-        if (d->irq == AU1000_GPIO15_INT)
-                __raw_writel(0x4000, (void __iomem *)PB1000_MDR); /* enable int */
-#endif
         wmb();
 }
 
diff --git a/arch/mips/alchemy/devboards/Makefile b/arch/mips/alchemy/devboards/Makefile
index 826449c817c3..bea80d787781 100644
--- a/arch/mips/alchemy/devboards/Makefile
+++ b/arch/mips/alchemy/devboards/Makefile
@@ -4,7 +4,6 @@
 
 obj-y += prom.o bcsr.o platform.o
 obj-$(CONFIG_PM)                += pm.o
-obj-$(CONFIG_MIPS_PB1000)       += pb1000/
 obj-$(CONFIG_MIPS_PB1100)       += pb1100/
 obj-$(CONFIG_MIPS_PB1200)       += pb1200/
 obj-$(CONFIG_MIPS_PB1500)       += pb1500/
diff --git a/arch/mips/alchemy/devboards/pb1000/Makefile b/arch/mips/alchemy/devboards/pb1000/Makefile
deleted file mode 100644
index 97c6615ba2bb..000000000000
--- a/arch/mips/alchemy/devboards/pb1000/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#  Copyright 2000, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc. <source@mvista.com>
-#
-# Makefile for the Alchemy Semiconductor Pb1000 board.
-#
-
-obj-y := board_setup.o
diff --git a/arch/mips/alchemy/devboards/pb1000/board_setup.c b/arch/mips/alchemy/devboards/pb1000/board_setup.c
deleted file mode 100644
index e64fdcbf75d0..000000000000
--- a/arch/mips/alchemy/devboards/pb1000/board_setup.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc. <source@mvista.com>
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/pm.h>
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-pb1x00/pb1000.h>
-#include <asm/reboot.h>
-#include <prom.h>
-
-#include "../platform.h"
-
-const char *get_system_type(void)
-{
-        return "Alchemy Pb1000";
-}
-
-static void board_reset(char *c)
-{
-        asm volatile ("jr %0" : : "r" (0xbfc00000));
-}
-
-static void board_power_off(void)
-{
-        while (1)
-                asm volatile (
-                "       .set    mips32                                  \n"
-                "       wait                                            \n"
-                "       .set    mips0                                   \n");
-}
-
-void __init board_setup(void)
-{
-        u32 pin_func, static_cfg0;
-        u32 sys_freqctrl, sys_clksrc;
-        u32 prid = read_c0_prid();
-
-        sys_freqctrl = 0;
-        sys_clksrc = 0;
-
-        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
-        au_writel(8, SYS_AUXPLL);
-        alchemy_gpio1_input_enable();
-        udelay(100);
-
-#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
-        /* Zero and disable FREQ2 */
-        sys_freqctrl = au_readl(SYS_FREQCTRL0);
-        sys_freqctrl &= ~0xFFF00000;
-        au_writel(sys_freqctrl, SYS_FREQCTRL0);
-
-        /* Zero and disable USBH/USBD clocks */
-        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
-                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
-        au_writel(sys_clksrc, SYS_CLKSRC);
-
-        sys_freqctrl = au_readl(SYS_FREQCTRL0);
-        sys_freqctrl &= ~0xFFF00000;
-
-        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
-                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
-
-        switch (prid & 0x000000FF) {
-        case 0x00: /* DA */
-        case 0x01: /* HA */
-        case 0x02: /* HB */
-                /* CPU core freq to 48 MHz to slow it way down... */
-                au_writel(4, SYS_CPUPLL);
-
-                /*
-                 * Setup 48 MHz FREQ2 from CPUPLL for USB Host
-                 * FRDIV2 = 3 -> div by 8 of 384 MHz -> 48 MHz
-                 */
-                sys_freqctrl |= (3 << SYS_FC_FRDIV2_BIT) | SYS_FC_FE2;
-                au_writel(sys_freqctrl, SYS_FREQCTRL0);
-
-                /* CPU core freq to 384 MHz */
-                au_writel(0x20, SYS_CPUPLL);
-
-                printk(KERN_INFO "Au1000: 48 MHz OHCI workaround enabled\n");
-                break;
-
-        default: /* HC and newer */
-                /* FREQ2 = aux / 2 = 48 MHz */
-                sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) |
-                                 SYS_FC_FE2 | SYS_FC_FS2;
-                au_writel(sys_freqctrl, SYS_FREQCTRL0);
-                break;
-        }
-
-        /*
-         * Route 48 MHz FREQ2 into USB Host and/or Device
-         */
-        sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MUH_BIT;
-        au_writel(sys_clksrc, SYS_CLKSRC);
-
-        /* Configure pins GPIO[14:9] as GPIO */
-        pin_func = au_readl(SYS_PINFUNC) & ~(SYS_PF_UR3 | SYS_PF_USB);
-
-        /* 2nd USB port is USB host */
-        pin_func |= SYS_PF_USB;
-
-        au_writel(pin_func, SYS_PINFUNC);
-
-        alchemy_gpio_direction_input(11);
-        alchemy_gpio_direction_input(13);
-        alchemy_gpio_direction_output(4, 0);
-        alchemy_gpio_direction_output(5, 0);
-#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
-
-        /* Make GPIO 15 an input (for interrupt line) */
-        pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_IRF;
-        /* We don't need I2S, so make it available for GPIO[31:29] */
-        pin_func |= SYS_PF_I2S;
-        au_writel(pin_func, SYS_PINFUNC);
-
-        alchemy_gpio_direction_input(15);
-
-        static_cfg0 = au_readl(MEM_STCFG0) & ~0xc00;
-        au_writel(static_cfg0, MEM_STCFG0);
-
-        /* configure RCE2* for LCD */
-        au_writel(0x00000004, MEM_STCFG2);
-
-        /* MEM_STTIME2 */
-        au_writel(0x09000000, MEM_STTIME2);
-
-        /* Set 32-bit base address decoding for RCE2* */
-        au_writel(0x10003ff0, MEM_STADDR2);
-
-        /*
-         * PCI CPLD setup
-         * Expand CE0 to cover PCI
-         */
-        au_writel(0x11803e40, MEM_STADDR1);
-
-        /* Burst visibility on */
-        au_writel(au_readl(MEM_STCFG0) | 0x1000, MEM_STCFG0);
-
-        au_writel(0x83, MEM_STCFG1);         /* ewait enabled, flash timing */
-        au_writel(0x33030a10, MEM_STTIME1);  /* slower timing for FPGA */
-
-        /* Setup the static bus controller */
-        au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
-        au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
-        au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
-
-        /*
-         * Enable Au1000 BCLK switching - note: sed1356 must not use
-         * its BCLK (Au1000 LCLK) for any timings
-         */
-        switch (prid & 0x000000FF) {
-        case 0x00: /* DA */
-        case 0x01: /* HA */
-        case 0x02: /* HB */
-                break;
-        default:  /* HC and newer */
-                /*
-                 * Enable sys bus clock divider when IDLE state or no bus
-                 * activity.
-                 */
-                au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
-                break;
-        }
-
-        pm_power_off = board_power_off;
-        _machine_halt = board_power_off;
-        _machine_restart = board_reset;
-}
-
-static int __init pb1000_init_irq(void)
-{
-        irq_set_irq_type(AU1000_GPIO15_INT, IRQF_TRIGGER_LOW);
-        return 0;
-}
-arch_initcall(pb1000_init_irq);
-
-static int __init pb1000_device_init(void)
-{
-        return db1x_register_norflash(8 * 1024 * 1024, 4, 0);
-}
-device_initcall(pb1000_device_init);
diff --git a/arch/mips/alchemy/devboards/prom.c b/arch/mips/alchemy/devboards/prom.c
index e5306b56da6d..56d7ea52fd97 100644
--- a/arch/mips/alchemy/devboards/prom.c
+++ b/arch/mips/alchemy/devboards/prom.c
@@ -33,7 +33,7 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <prom.h>
 
-#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_DB1000) || \
+#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)