From 910db6442a73b4053290c3306763d2dd531fb87e Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@gmail.com>
Date: Tue, 10 Apr 2012 15:12:45 +0800
Subject: [PATCH] --- yaml --- r: 303239 b: refs/heads/master c:
 3f4dd3224df9664a44bf05df56c7c12622f7a1c7 h: refs/heads/master i:   303237:
 9aea8ca0d512b5fddcee1c0b85f50d4e3e1674c8   303235:
 a06d9d781aed85d66d391596ca40c79903a409a9   303231:
 3f8fc7f0b30637d00b4e8b7a2c4939b7a2a1d2c5 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/arm/mach-mmp/Kconfig | 29 +++++++++++++++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index ec6f76e1cbf2..b42d4508c1a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53c50ef508cc7b47c8b912549d4e2593fd0e5049
+refs/heads/master: 3f4dd3224df9664a44bf05df56c7c12622f7a1c7
diff --git a/trunk/arch/arm/mach-mmp/Kconfig b/trunk/arch/arm/mach-mmp/Kconfig
index 5a90b9a3ab6e..ede721628150 100644
--- a/trunk/arch/arm/mach-mmp/Kconfig
+++ b/trunk/arch/arm/mach-mmp/Kconfig
@@ -2,16 +2,6 @@ if ARCH_MMP
 
 menu "Marvell PXA168/910/MMP2 Implmentations"
 
-config MACH_MMP_DT
-	bool "Support MMP2 platforms from device tree"
-	select CPU_PXA168
-	select CPU_PXA910
-	select USE_OF
-	help
-	  Include support for Marvell MMP2 based platforms using
-	  the device tree. Needn't select any other machine while
-	  MACH_MMP_DT is enabled.
-
 config MACH_ASPENITE
 	bool "Marvell's PXA168 Aspenite Development Board"
 	select CPU_PXA168
@@ -94,6 +84,25 @@ config MACH_GPLUGD
 	  Say 'Y' here if you want to support the Marvell PXA168-based
 	  GuruPlug Display (gplugD) Board
 
+config MACH_MMP_DT
+	bool "Support MMP (ARMv5) platforms from device tree"
+	select CPU_PXA168
+	select CPU_PXA910
+	select USE_OF
+	help
+	  Include support for Marvell MMP2 based platforms using
+	  the device tree. Needn't select any other machine while
+	  MACH_MMP_DT is enabled.
+
+config MACH_MMP2_DT
+	bool "Support MMP2 (ARMv7) platforms from device tree"
+	depends on !CPU_MOHAWK
+	select CPU_MMP2
+	select USE_OF
+	help
+	  Include support for Marvell MMP2 based platforms using
+	  the device tree.
+
 endmenu
 
 config CPU_PXA168