From 1cdd2ca82b297fb2276923d11d8fa5113dd43e48 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Wed, 16 May 2012 15:46:03 +0900
Subject: [PATCH] --- yaml --- r: 303279 b: refs/heads/master c:
 450cca47d65b7500ba05d56770adbf8c758dc87d h: refs/heads/master i:   303277:
 b50f3f4d73ef41e4bbe13d23887774b28efb3005   303275:
 b9080445a1e334b7b5a48524fe0fa7fb4028282b   303271:
 43b35323beecb482cd685155f7a70fad12d452ee   303263:
 c1d300f36572f20b0eced5fb939815e6382dc8d8 v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/arm/boot/dts/emev2-kzm9d.dts    | 26 ++++++++++++++++++++++
 trunk/arch/arm/mach-shmobile/Kconfig       |  1 +
 trunk/arch/arm/mach-shmobile/board-kzm9d.c |  8 ++++++-
 trunk/arch/arm/mach-shmobile/platsmp.c     |  3 ++-
 5 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 trunk/arch/arm/boot/dts/emev2-kzm9d.dts

diff --git a/[refs] b/[refs]
index 1780b66032d4..19a014db9af1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d5de27174955702bc874302ba9e72d71d5acd58
+refs/heads/master: 450cca47d65b7500ba05d56770adbf8c758dc87d
diff --git a/trunk/arch/arm/boot/dts/emev2-kzm9d.dts b/trunk/arch/arm/boot/dts/emev2-kzm9d.dts
new file mode 100644
index 000000000000..297e3baba71c
--- /dev/null
+++ b/trunk/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -0,0 +1,26 @@
+/*
+ * Device Tree Source for the KZM9D board
+ *
+ * Copyright (C) 2012 Renesas Solutions Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+/dts-v1/;
+
+/include/ "emev2.dtsi"
+
+/ {
+	model = "EMEV2 KZM9D Board";
+	compatible = "renesas,kzm9d", "renesas,emev2";
+
+	memory {
+		device_type = "memory";
+		reg = <0x40000000 0x8000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS1,115200n81";
+	};
+};
diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig
index 8d3c2b18524c..7dcf08ee979d 100644
--- a/trunk/arch/arm/mach-shmobile/Kconfig
+++ b/trunk/arch/arm/mach-shmobile/Kconfig
@@ -107,6 +107,7 @@ config MACH_MARZEN
 config MACH_KZM9D
 	bool "KZM9D board"
 	depends on ARCH_EMEV2
+	select USE_OF
 
 comment "SH-Mobile System Configuration"
 
diff --git a/trunk/arch/arm/mach-shmobile/board-kzm9d.c b/trunk/arch/arm/mach-shmobile/board-kzm9d.c
index be81f0feba06..7bc5e7d39f9b 100644
--- a/trunk/arch/arm/mach-shmobile/board-kzm9d.c
+++ b/trunk/arch/arm/mach-shmobile/board-kzm9d.c
@@ -68,7 +68,12 @@ void __init kzm9d_add_standard_devices(void)
 	platform_add_devices(kzm9d_devices, ARRAY_SIZE(kzm9d_devices));
 }
 
-MACHINE_START(KZM9D, "kzm9d")
+static const char *kzm9d_boards_compat_dt[] __initdata = {
+	"renesas,kzm9d",
+	NULL,
+};
+
+DT_MACHINE_START(KZM9D_DT, "kzm9d")
 	.map_io		= emev2_map_io,
 	.init_early	= emev2_add_early_devices,
 	.nr_irqs	= NR_IRQS_LEGACY,
@@ -76,4 +81,5 @@ MACHINE_START(KZM9D, "kzm9d")
 	.handle_irq	= gic_handle_irq,
 	.init_machine	= kzm9d_add_standard_devices,
 	.timer		= &shmobile_timer,
+	.dt_compat	= kzm9d_boards_compat_dt,
 MACHINE_END
diff --git a/trunk/arch/arm/mach-shmobile/platsmp.c b/trunk/arch/arm/mach-shmobile/platsmp.c
index 959b021e52be..7006cdc8b8ca 100644
--- a/trunk/arch/arm/mach-shmobile/platsmp.c
+++ b/trunk/arch/arm/mach-shmobile/platsmp.c
@@ -16,6 +16,7 @@
 #include <linux/device.h>
 #include <linux/smp.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <asm/hardware/gic.h>
 #include <asm/mach-types.h>
 #include <mach/common.h>
@@ -23,7 +24,7 @@
 
 #define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2())
 #define is_r8a7779() machine_is_marzen()
-#define is_emev2() machine_is_kzm9d()
+#define is_emev2() of_machine_is_compatible("renesas,emev2")
 
 static unsigned int __init shmobile_smp_get_core_count(void)
 {