diff options
| author | Magnus Damm <damm@opensource.se> | 2012-05-14 19:54:41 +0900 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-14 23:23:42 +0200 |
| commit | e6bf705911a0b64c589b6c408a316e7d465acbbd (patch) | |
| tree | cb4e65275d8375c3390d6c9640feb20193bd8420 /arch/arm/mach-shmobile | |
| parent | 9183857d503f915ee05abb6e03cea7253dcbace6 (diff) | |
| download | talos-op-linux-e6bf705911a0b64c589b6c408a316e7d465acbbd.tar.gz talos-op-linux-e6bf705911a0b64c589b6c408a316e7d465acbbd.zip | |
ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
Use DT_MACHINE_START() on the r8a7740 based armadillo 800 eva 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-armadillo800eva.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 7828a7a5f8d6..ed770b9cc824 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -97,6 +97,7 @@ config MACH_ARMADILLO800EVA bool "Armadillo-800 EVA board" depends on ARCH_R8A7740 select ARCH_REQUIRE_GPIOLIB + select USE_OF config MACH_MARZEN bool "MARZEN board" diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index e750ea69cc94..9e37026ef9dd 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -768,11 +768,17 @@ static void __init eva_add_early_devices(void) shmobile_timer.init = eva_earlytimer_init; } -MACHINE_START(ARMADILLO800EVA, "armadillo800eva") +static const char *eva_boards_compat_dt[] __initdata = { + "renesas,armadillo800eva", + NULL, +}; + +DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") .map_io = r8a7740_map_io, .init_early = eva_add_early_devices, .init_irq = r8a7740_init_irq, .handle_irq = shmobile_handle_irq_intc, .init_machine = eva_init, .timer = &shmobile_timer, + .dt_compat = eva_boards_compat_dt, MACHINE_END |
