Commit 4fc5e65c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

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

* renesas-kzm9g:
  ARM: mach-shmobile: Use DT_MACHINE for KZM9G
parents 3c437430 7296d932
/*
* 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>;
};
};
...@@ -108,6 +108,7 @@ config MACH_KZM9G ...@@ -108,6 +108,7 @@ config MACH_KZM9G
bool "KZM-A9-GT board" bool "KZM-A9-GT board"
depends on ARCH_SH73A0 depends on ARCH_SH73A0
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select USE_OF
comment "SH-Mobile System Configuration" comment "SH-Mobile System Configuration"
......
...@@ -443,7 +443,12 @@ static void __init kzm_init(void) ...@@ -443,7 +443,12 @@ static void __init kzm_init(void)
platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices)); 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, .map_io = sh73a0_map_io,
.init_early = sh73a0_add_early_devices, .init_early = sh73a0_add_early_devices,
.nr_irqs = NR_IRQS_LEGACY, .nr_irqs = NR_IRQS_LEGACY,
...@@ -451,4 +456,5 @@ MACHINE_START(KZM9G, "kzm9g") ...@@ -451,4 +456,5 @@ MACHINE_START(KZM9G, "kzm9g")
.handle_irq = gic_handle_irq, .handle_irq = gic_handle_irq,
.init_machine = kzm_init, .init_machine = kzm_init,
.timer = &shmobile_timer, .timer = &shmobile_timer,
.dt_compat = kzm9g_boards_compat_dt,
MACHINE_END MACHINE_END
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment