diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-14 23:25:04 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-14 23:25:04 +0200 |
| commit | 3c437430f1493b77f5fd3cbc1473b7bdc9686b91 (patch) | |
| tree | b84a00adee384bfa8b8b2c6c2a488b7bbae0340b /arch/arm/mach-shmobile | |
| parent | a515be1ca7df947db0f6018a174f49507affcdbc (diff) | |
| parent | e6bf705911a0b64c589b6c408a316e7d465acbbd (diff) | |
| download | linux-3c437430f1493b77f5fd3cbc1473b7bdc9686b91.tar.gz | |
Merge branch 'renesas-armadillo800eva' into renesas-board-new
* renesas-armadillo800eva:
ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
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 e703bd280f98..054f1a3a43cb 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 |