ARM: mmp: move into ARCH_MULTIPLATFORM

With all dependencies taken care of, this enables building
the Marvell mmp platform as part of ARCH_MULTIPLATFORM, along
with other ARMv5 and ARMv7 platforms.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Andrew Lunn <andrew@lunn.ch>

3 files changed, 27 insertions, 53 deletions

diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
index fdbfadf00c84..01c57d369462 100644
--- a/arch/arm/mach-mmp/Kconfig
+++ b/arch/arm/mach-mmp/Kconfig
@@ -1,9 +1,22 @@
+menuconfig ARCH_MMP
+        bool "Marvell PXA168/910/MMP2"
+        depends on ARCH_MULTI_V5 || ARCH_MULTI_V7
+        select ARCH_REQUIRE_GPIOLIB
+        select GPIO_PXA
+        select PINCTRL
+        select PLAT_PXA
+        help
+          Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.
+
 if ARCH_MMP
 
-menu "Marvell PXA168/910/MMP2 Implmentations"
+menu "Marvell PXA168/910/MMP2 Implementations"
+
+if ATAGS
 
 config MACH_ASPENITE
         bool "Marvell's PXA168 Aspenite Development Board"
+        depends on ARCH_MULTI_V5
         select CPU_PXA168
         help
           Say 'Y' here if you want to support the Marvell PXA168-based
@@ -11,6 +24,7 @@ config MACH_ASPENITE
 
 config MACH_ZYLONITE2
         bool "Marvell's PXA168 Zylonite2 Development Board"
+        depends on ARCH_MULTI_V5
         select CPU_PXA168
         help
           Say 'Y' here if you want to support the Marvell PXA168-based
@@ -18,6 +32,7 @@ config MACH_ZYLONITE2
 
 config MACH_AVENGERS_LITE
         bool "Marvell's PXA168 Avengers Lite Development Board"
+        depends on ARCH_MULTI_V5
         select CPU_PXA168
         help
           Say 'Y' here if you want to support the Marvell PXA168-based
@@ -25,6 +40,7 @@ config MACH_AVENGERS_LITE
 
 config MACH_TAVOREVB
         bool "Marvell's PXA910 TavorEVB Development Board"
+        depends on ARCH_MULTI_V5
         select CPU_PXA910
         help
           Say 'Y' here if you want to support the Marvell PXA910-based
@@ -32,6 +48,7 @@ config MACH_TAVOREVB
 
 config MACH_TTC_DKB
         bool "Marvell's PXA910 TavorEVB Development Board"
+        depends on ARCH_MULTI_V5
         select CPU_PXA910
         help
           Say 'Y' here if you want to support the Marvell PXA910-based
@@ -39,7 +56,7 @@ config MACH_TTC_DKB
 
 config MACH_BROWNSTONE
         bool "Marvell's Brownstone Development Platform"
-        depends on !CPU_MOHAWK
+        depends on ARCH_MULTI_V7
         select CPU_MMP2
         help
           Say 'Y' here if you want to support the Marvell MMP2-based
@@ -50,7 +67,7 @@ config MACH_BROWNSTONE
 
 config MACH_FLINT
         bool "Marvell's Flint Development Platform"
-        depends on !CPU_MOHAWK
+        depends on ARCH_MULTI_V7
         select CPU_MMP2
         help
           Say 'Y' here if you want to support the Marvell MMP2-based
@@ -61,7 +78,7 @@ config MACH_FLINT
 
 config MACH_MARVELL_JASPER
         bool "Marvell's Jasper Development Platform"
-        depends on !CPU_MOHAWK
+        depends on ARCH_MULTI_V7
         select CPU_MMP2
         help
           Say 'Y' here if you want to support the Marvell MMP2-base
@@ -72,6 +89,7 @@ config MACH_MARVELL_JASPER
 
 config MACH_TETON_BGA
         bool "Marvell's PXA168 Teton BGA Development Board"
+        depends on ARCH_MULTI_V5
         select CPU_PXA168
         help
           Say 'Y' here if you want to support the Marvell PXA168-based
@@ -79,14 +97,16 @@ config MACH_TETON_BGA
 
 config MACH_GPLUGD
         bool "Marvell's PXA168 GuruPlug Display (gplugD) Board"
+        depends on ARCH_MULTI_V5
         select CPU_PXA168
         help
           Say 'Y' here if you want to support the Marvell PXA168-based
           GuruPlug Display (gplugD) Board
+endif
 
 config MACH_MMP_DT
         bool "Support MMP (ARMv5) platforms from device tree"
-        select USE_OF
+        depends on ARCH_MULTI_V5
         select PINCTRL
         select PINCTRL_SINGLE
         select COMMON_CLK
@@ -99,11 +119,9 @@ config MACH_MMP_DT
 
 config MACH_MMP2_DT
         bool "Support MMP2 (ARMv7) platforms from device tree"
-        depends on !CPU_MOHAWK
-        select USE_OF
+        depends on ARCH_MULTI_V7
         select PINCTRL
         select PINCTRL_SINGLE
-        select COMMON_CLK
         select ARCH_HAS_RESET_CONTROLLER
         select CPU_PJ4
         help
diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile
index 98f0f6388e44..7677ad5414e9 100644
--- a/arch/arm/mach-mmp/Makefile
+++ b/arch/arm/mach-mmp/Makefile
@@ -1,6 +1,7 @@
 #
 # Makefile for Marvell's PXA168 processors line
 #
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-pxa/include
 
 obj-y                           += common.o devices.o time.o
 
diff --git a/arch/arm/mach-mmp/include/mach/uncompress.h b/arch/arm/mach-mmp/include/mach/uncompress.h
deleted file mode 100644
index 8890fa8fa771..000000000000
--- a/arch/arm/mach-mmp/include/mach/uncompress.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * arch/arm/mach-mmp/include/mach/uncompress.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/serial_reg.h>
-#include <mach/addr-map.h>
-#include <asm/mach-types.h>
-
-#define UART1_BASE      (APB_PHYS_BASE + 0x36000)
-#define UART2_BASE      (APB_PHYS_BASE + 0x17000)
-#define UART3_BASE      (APB_PHYS_BASE + 0x18000)
-
-volatile unsigned long *UART;
-
-static inline void putc(char c)
-{
-        /* UART enabled? */
-        if (!(UART[UART_IER] & UART_IER_UUE))
-                return;
-
-        while (!(UART[UART_LSR] & UART_LSR_THRE))
-                barrier();
-
-        UART[UART_TX] = c;
-}
-
-/*
- * This does not append a newline
- */
-static inline void flush(void)
-{
-}
-
-static inline void arch_decomp_setup(void)
-{
-        /* default to UART2 */
-        UART = (unsigned long *)UART2_BASE;
-
-        if (machine_is_avengers_lite())
-                UART = (unsigned long *)UART3_BASE;
-}