Merge branch 'renesas-kzm9g' into renesas-board-new

* renesas-kzm9g:
  ARM: mach-shmobile: Use DT_MACHINE for KZM9G

3 files changed, 30 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts
new file mode 100644
index 00000000000..ed1bae5a24f
--- /dev/null
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -0,0 +1,22 @@
+/*
+ * Device Tree Source for the KZM-A9-GT 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/ "skeleton.dtsi"
+
+/ {
+        model = "KZM-A9-GT";
+        compatible = "renesas,kzm9g";
+
+        memory {
+                device_type = "memory";
+                reg = <0x41000000 0x1e800000>;
+        };
+};
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 054f1a3a43c..8e3602adabe 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -108,6 +108,7 @@ config MACH_KZM9G
         bool "KZM-A9-GT board"
         depends on ARCH_SH73A0
         select ARCH_REQUIRE_GPIOLIB
+        select USE_OF
 
 comment "SH-Mobile System Configuration"
 
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 78e9850967e..d8e33b68283 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -443,7 +443,12 @@ static void __init kzm_init(void)
         platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices));
 }
 
-MACHINE_START(KZM9G, "kzm9g")
+static const char *kzm9g_boards_compat_dt[] __initdata = {
+        "renesas,kzm9g",
+        NULL,
+};
+
+DT_MACHINE_START(KZM9G_DT, "kzm9g")
         .map_io         = sh73a0_map_io,
         .init_early     = sh73a0_add_early_devices,
         .nr_irqs        = NR_IRQS_LEGACY,
@@ -451,4 +456,5 @@ MACHINE_START(KZM9G, "kzm9g")
         .handle_irq     = gic_handle_irq,
         .init_machine   = kzm_init,
         .timer          = &shmobile_timer,
+        .dt_compat      = kzm9g_boards_compat_dt,
 MACHINE_END