MIPS: Alchemy: Unify Devboard support.

This patch merges support for all DB1xxx and PB1xxx
boards into a single image, along with a new single defconfig
for them.

Run-tested on DB1300 and DB1500.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/6577/
Patchwork: https://patchwork.linux-mips.org/patch/6659/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

8 files changed, 82 insertions, 70 deletions

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index 41386723f9fa..b9628983d620 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -16,7 +16,7 @@ config ALCHEMY_GPIO_INDIRECT
 choice
         prompt "Machine type"
         depends on MIPS_ALCHEMY
-        default MIPS_DB1000
+        default MIPS_DB1XXX
 
 config MIPS_MTX1
         bool "4G Systems MTX-1 board"
@@ -25,20 +25,17 @@ config MIPS_MTX1
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
-config MIPS_DB1000
-        bool "Alchemy DB1000/DB1500/DB1100 PB1500/1100 boards"
-        select ALCHEMY_GPIOINT_AU1000
-        select HW_HAS_PCI
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-
-config MIPS_DB1235
-        bool "Alchemy DB1200/PB1200/DB1300/DB1550/PB1550 boards"
+config MIPS_DB1XXX
+        bool "Alchemy DB1XXX / PB1XXX boards"
         select ARCH_REQUIRE_GPIOLIB
         select HW_HAS_PCI
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
+        help
+          Select this option if you have one of the following Alchemy
+          development boards:  DB1000 DB1500 DB1100 DB1550 DB1200 DB1300
+                               PB1500 PB1100 PB1550 PB1200
+          Board type is autodetected during boot.
 
 config MIPS_XXS1500
         bool "MyCable XXS1500 board"
diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform
index b3afcdd8d77a..33c9da3b077b 100644
--- a/arch/mips/alchemy/Platform
+++ b/arch/mips/alchemy/Platform
@@ -5,18 +5,12 @@ platform-$(CONFIG_MIPS_ALCHEMY) += alchemy/common/
 
 
 #
-# AMD Alchemy Db1000/Db1500/Pb1500/Db1100/Pb1100 eval boards
+# AMD Alchemy Db1000/Db1500/Pb1500/Db1100/Pb1100
+#             Db1550/Pb1550/Db1200/Pb1200/Db1300
 #
-platform-$(CONFIG_MIPS_DB1000)  += alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1000)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1000)      += 0xffffffff80100000
-
-#
-# AMD Alchemy Db1200/Pb1200/Db1550/Pb1550/Db1300 eval boards
-#
-platform-$(CONFIG_MIPS_DB1235)  += alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1235)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1235)      += 0xffffffff80100000
+platform-$(CONFIG_MIPS_DB1XXX)  += alchemy/devboards/
+cflags-$(CONFIG_MIPS_DB1XXX)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
+load-$(CONFIG_MIPS_DB1XXX)      += 0xffffffff80100000
 
 #
 # 4G-Systems MTX-1 "MeshCube" wireless router
diff --git a/arch/mips/alchemy/devboards/Makefile b/arch/mips/alchemy/devboards/Makefile
index 15bf7306648b..9da3659a9d1c 100644
--- a/arch/mips/alchemy/devboards/Makefile
+++ b/arch/mips/alchemy/devboards/Makefile
@@ -2,7 +2,5 @@
 # Alchemy Develboards
 #
 
-obj-y += bcsr.o platform.o
+obj-y += bcsr.o platform.o db1000.o db1200.o db1300.o db1550.o db1xxx.o
 obj-$(CONFIG_PM)                += pm.o
-obj-$(CONFIG_MIPS_DB1000)       += db1000.o
-obj-$(CONFIG_MIPS_DB1235)       += db1235.o db1200.o db1300.o db1550.o
diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c
index 5483906e0f86..92dd929d4057 100644
--- a/arch/mips/alchemy/devboards/db1000.c
+++ b/arch/mips/alchemy/devboards/db1000.c
@@ -41,42 +41,27 @@
 
 #define F_SWAPPED (bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1000_SWAPBOOT)
 
-struct pci_dev;
+const char *get_system_type(void);
 
-static const char *board_type_str(void)
+int __init db1000_board_setup(void)
 {
+        /* initialize board register space */
+        bcsr_init(DB1000_BCSR_PHYS_ADDR,
+                  DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);
+
         switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {
         case BCSR_WHOAMI_DB1000:
-                return "DB1000";
         case BCSR_WHOAMI_DB1500:
-                return "DB1500";
         case BCSR_WHOAMI_DB1100:
-                return "DB1100";
         case BCSR_WHOAMI_PB1500:
         case BCSR_WHOAMI_PB1500R2:
-                return "PB1500";
         case BCSR_WHOAMI_PB1100:
-                return "PB1100";
-        default:
-                return "(unknown)";
+                pr_info("AMD Alchemy %s Board\n", get_system_type());
+                return 0;
         }
+        return -ENODEV;
 }
 
-const char *get_system_type(void)
-{
-        return board_type_str();
-}
-
-void __init board_setup(void)
-{
-        /* initialize board register space */
-        bcsr_init(DB1000_BCSR_PHYS_ADDR,
-                  DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);
-
-        printk(KERN_INFO "AMD Alchemy %s Board\n", board_type_str());
-}
-
-
 static int db1500_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
 {
         if ((slot < 12) || (slot > 13) || pin == 0)
@@ -114,17 +99,10 @@ static struct platform_device db1500_pci_host_dev = {
         .resource       = alchemy_pci_host_res,
 };
 
-static int __init db1500_pci_init(void)
+int __init db1500_pci_setup(void)
 {
-        int id = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
-        if ((id == BCSR_WHOAMI_DB1500) || (id == BCSR_WHOAMI_PB1500) ||
-            (id == BCSR_WHOAMI_PB1500R2))
-                return platform_device_register(&db1500_pci_host_dev);
-        return 0;
+        return platform_device_register(&db1500_pci_host_dev);
 }
-/* must be arch_initcall; MIPS PCI scans busses in a subsys_initcall */
-arch_initcall(db1500_pci_init);
-
 
 static struct resource au1100_lcd_resources[] = {
         [0] = {
@@ -513,7 +491,7 @@ static struct platform_device *db1100_devs[] = {
         &db1000_irda_dev,
 };
 
-static int __init db1000_dev_init(void)
+int __init db1000_dev_setup(void)
 {
         int board = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
         int c0, c1, d0, d1, s0, s1, flashsize = 32,  twosocks = 1;
@@ -623,4 +601,3 @@ static int __init db1000_dev_init(void)
         db1x_register_norflash(flashsize << 20, 4 /* 32bit */, F_SWAPPED);
         return 0;
 }
-device_initcall(db1000_dev_init);
diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
index a84d98b8f96e..a60d0a3410ea 100644
--- a/arch/mips/alchemy/devboards/db1200.c
+++ b/arch/mips/alchemy/devboards/db1200.c
@@ -89,6 +89,15 @@ int __init db1200_board_setup(void)
                 return -ENODEV;
 
         whoami = bcsr_read(BCSR_WHOAMI);
+        switch (BCSR_WHOAMI_BOARD(whoami)) {
+        case BCSR_WHOAMI_PB1200_DDR1:
+        case BCSR_WHOAMI_PB1200_DDR2:
+        case BCSR_WHOAMI_DB1200:
+                break;
+        default:
+                return -ENODEV;
+        }
+
         printk(KERN_INFO "Alchemy/AMD/RMI %s Board, CPLD Rev %d"
                 "  Board-ID %d  Daughtercard ID %d\n", get_system_type(),
                 (whoami >> 4) & 0xf, (whoami >> 8) & 0xf, whoami & 0xf);
diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index 6167e73eef9c..509602cb463a 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -759,11 +759,15 @@ int __init db1300_board_setup(void)
 {
         unsigned short whoami;
 
-        db1300_gpio_config();
         bcsr_init(DB1300_BCSR_PHYS_ADDR,
                   DB1300_BCSR_PHYS_ADDR + DB1300_BCSR_HEXLED_OFS);
 
         whoami = bcsr_read(BCSR_WHOAMI);
+        if (BCSR_WHOAMI_BOARD(whoami) != BCSR_WHOAMI_DB1300)
+                return -ENODEV;
+
+        db1300_gpio_config();
+
         printk(KERN_INFO "NetLogic DBAu1300 Development Platform.\n\t"
                 "BoardID %d   CPLD Rev %d   DaughtercardID %d\n",
                 BCSR_WHOAMI_BOARD(whoami), BCSR_WHOAMI_CPLD(whoami),
diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index 016cddacd7ea..bbd8d9884702 100644
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -62,10 +62,16 @@ int __init db1550_board_setup(void)
                   DB1550_BCSR_PHYS_ADDR + DB1550_BCSR_HEXLED_OFS);
 
         whoami = bcsr_read(BCSR_WHOAMI); /* PB1550 hexled offset differs */
-        if ((BCSR_WHOAMI_BOARD(whoami) == BCSR_WHOAMI_PB1550_SDR) ||
-            (BCSR_WHOAMI_BOARD(whoami) == BCSR_WHOAMI_PB1550_DDR))
+        switch (BCSR_WHOAMI_BOARD(whoami)) {
+        case BCSR_WHOAMI_PB1550_SDR:
+        case BCSR_WHOAMI_PB1550_DDR:
                 bcsr_init(PB1550_BCSR_PHYS_ADDR,
                           PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);
+        case BCSR_WHOAMI_DB1550:
+                break;
+        default:
+                return -ENODEV;
+        }
 
         pr_info("Alchemy/AMD %s Board, CPLD Rev %d Board-ID %d  "       \
                 "Daughtercard ID %d\n", get_system_type(),
diff --git a/arch/mips/alchemy/devboards/db1235.c b/arch/mips/alchemy/devboards/db1xxx.c
index bac19dc43d1d..2d47f951121a 100644
--- a/arch/mips/alchemy/devboards/db1235.c
+++ b/arch/mips/alchemy/devboards/db1xxx.c
@@ -1,12 +1,13 @@
 /*
- * DB1200/PB1200 / DB1550 / DB1300 board support.
- *
- * These 4 boards can reliably be supported in a single kernel image.
+ * Alchemy DB/PB1xxx board support.
  */
 
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-db1x00/bcsr.h>
 
+int __init db1000_board_setup(void);
+int __init db1000_dev_setup(void);
+int __init db1500_pci_setup(void);
 int __init db1200_board_setup(void);
 int __init db1200_dev_setup(void);
 int __init db1300_board_setup(void);
@@ -18,6 +19,17 @@ int __init db1550_pci_setup(int);
 static const char *board_type_str(void)
 {
         switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {
+        case BCSR_WHOAMI_DB1000:
+                return "DB1000";
+        case BCSR_WHOAMI_DB1500:
+                return "DB1500";
+        case BCSR_WHOAMI_DB1100:
+                return "DB1100";
+        case BCSR_WHOAMI_PB1500:
+        case BCSR_WHOAMI_PB1500R2:
+                return "PB1500";
+        case BCSR_WHOAMI_PB1100:
+                return "PB1100";
         case BCSR_WHOAMI_PB1200_DDR1:
         case BCSR_WHOAMI_PB1200_DDR2:
                 return "PB1200";
@@ -45,6 +57,11 @@ void __init board_setup(void)
         int ret;
 
         switch (alchemy_get_cputype()) {
+        case ALCHEMY_CPU_AU1000:
+        case ALCHEMY_CPU_AU1500:
+        case ALCHEMY_CPU_AU1100:
+                ret = db1000_board_setup();
+                break;
         case ALCHEMY_CPU_AU1550:
                 ret = db1550_board_setup();
                 break;
@@ -62,7 +79,7 @@ void __init board_setup(void)
                 panic("cannot initialize board support");
 }
 
-int __init db1235_arch_init(void)
+static int __init db1xxx_arch_init(void)
 {
         int id = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
         if (id == BCSR_WHOAMI_DB1550)
@@ -70,14 +87,24 @@ int __init db1235_arch_init(void)
         else if ((id == BCSR_WHOAMI_PB1550_SDR) ||
                  (id == BCSR_WHOAMI_PB1550_DDR))
                 return db1550_pci_setup(1);
+        else if ((id == BCSR_WHOAMI_DB1500) || (id == BCSR_WHOAMI_PB1500) ||
+                 (id == BCSR_WHOAMI_PB1500R2))
+                return db1500_pci_setup();
 
         return 0;
 }
-arch_initcall(db1235_arch_init);
+arch_initcall(db1xxx_arch_init);
 
-int __init db1235_dev_init(void)
+static int __init db1xxx_dev_init(void)
 {
         switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {
+        case BCSR_WHOAMI_DB1000:
+        case BCSR_WHOAMI_DB1500:
+        case BCSR_WHOAMI_DB1100:
+        case BCSR_WHOAMI_PB1500:
+        case BCSR_WHOAMI_PB1500R2:
+        case BCSR_WHOAMI_PB1100:
+                return db1000_dev_setup();
         case BCSR_WHOAMI_PB1200_DDR1:
         case BCSR_WHOAMI_PB1200_DDR2:
         case BCSR_WHOAMI_DB1200:
@@ -91,4 +118,4 @@ int __init db1235_dev_init(void)
         }
         return 0;
 }
-device_initcall(db1235_dev_init);
+device_initcall(db1xxx_dev_init);