diff options
| author | Magnus Damm <damm@opensource.se> | 2012-05-14 23:22:28 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-14 23:22:28 +0200 |
| commit | 7296d93201710865233fbebf7c9853d2f95d7716 (patch) | |
| tree | 2c78bc9860d20de3a976771c149c5da27a655635 /arch/arm/mach-shmobile | |
| parent | fecf84c14fa755b0e30ba64a290db658a06c76fb (diff) | |
| download | blackbird-op-linux-7296d93201710865233fbebf7c9853d2f95d7716.tar.gz blackbird-op-linux-7296d93201710865233fbebf7c9853d2f95d7716.zip | |
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/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 8 |
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 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 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) 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 |
