aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2012-05-14 17:22:28 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-05-14 17:22:28 -0400
commit7296d93201710865233fbebf7c9853d2f95d7716 (patch)
tree2c78bc9860d20de3a976771c149c5da27a655635 /arch/arm/mach-shmobile
parentfecf84c14fa755b0e30ba64a290db658a06c76fb (diff)
ARM: mach-shmobile: Use DT_MACHINE for KZM9G
Use DT_MACHINE_START() on the sh73a0 based KZM9G board. Also include a tiny DTS file to describe the board and update the Kconfig dependencies to select CONFIG_USE_OF. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/Kconfig1
-rw-r--r--arch/arm/mach-shmobile/board-kzm9g.c8
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index c39413a86a6f..2ed39959d7d8 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -102,6 +102,7 @@ config MACH_KZM9G
102 bool "KZM-A9-GT board" 102 bool "KZM-A9-GT board"
103 depends on ARCH_SH73A0 103 depends on ARCH_SH73A0
104 select ARCH_REQUIRE_GPIOLIB 104 select ARCH_REQUIRE_GPIOLIB
105 select USE_OF
105 106
106comment "SH-Mobile System Configuration" 107comment "SH-Mobile System Configuration"
107 108
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 78e9850967eb..d8e33b682832 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)
443 platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices)); 443 platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices));
444} 444}
445 445
446MACHINE_START(KZM9G, "kzm9g") 446static const char *kzm9g_boards_compat_dt[] __initdata = {
447 "renesas,kzm9g",
448 NULL,
449};
450
451DT_MACHINE_START(KZM9G_DT, "kzm9g")
447 .map_io = sh73a0_map_io, 452 .map_io = sh73a0_map_io,
448 .init_early = sh73a0_add_early_devices, 453 .init_early = sh73a0_add_early_devices,
449 .nr_irqs = NR_IRQS_LEGACY, 454 .nr_irqs = NR_IRQS_LEGACY,
@@ -451,4 +456,5 @@ MACHINE_START(KZM9G, "kzm9g")
451 .handle_irq = gic_handle_irq, 456 .handle_irq = gic_handle_irq,
452 .init_machine = kzm_init, 457 .init_machine = kzm_init,
453 .timer = &shmobile_timer, 458 .timer = &shmobile_timer,
459 .dt_compat = kzm9g_boards_compat_dt,
454MACHINE_END 460MACHINE_END