MIPS: Alchemy: Merge PB1200 support into DB1200 code.

The PB1200 is basically a DB1200 with additional MMC and camera sockets
and different base addresses for external hardware (CPLD, IDE, Net, NAND).

This patch implements the missing PB1200 features in DB1200 support code
and runtime board detection.

Tested on DB1200 only.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2880/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 1 insertions, 9 deletions

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index a1b995ff517b..e1b3be787f80 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -42,7 +42,7 @@ config MIPS_DB1100
         select SYS_HAS_EARLY_PRINTK
 
 config MIPS_DB1200
-        bool "Alchemy DB1200 board"
+        bool "Alchemy DB1200/PB1200 board"
         select ALCHEMY_GPIOINT_AU1000
         select DMA_COHERENT
         select MIPS_DISABLE_OBSOLETE_IDE
@@ -85,14 +85,6 @@ config MIPS_PB1100
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
-config MIPS_PB1200
-        bool "Alchemy PB1200 board"
-        select ALCHEMY_GPIOINT_AU1000
-        select DMA_NONCOHERENT
-        select MIPS_DISABLE_OBSOLETE_IDE
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-
 config MIPS_PB1500
         bool "Alchemy PB1500 board"
         select ALCHEMY_GPIOINT_AU1000