Skip to content

Commit

Permalink
ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Magnus Damm authored and Rafael J. Wysocki committed May 14, 2012
1 parent 9183857 commit e6bf705
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 1 deletion.
22 changes: 22 additions & 0 deletions arch/arm/boot/dts/r8a7740-armadillo800eva.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Device Tree Source for the armadillo 800 eva 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 = "armadillo 800 eva";
compatible = "renesas,armadillo800eva";

memory {
device_type = "memory";
reg = <0x40000000 0x20000000>;
};
};
1 change: 1 addition & 0 deletions arch/arm/mach-shmobile/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 7 additions & 1 deletion arch/arm/mach-shmobile/board-armadillo800eva.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e6bf705

Please sign in to comment.