Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c437430 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'renesas-armadillo800eva' into renesas-board-new 

* renesas-armadillo800eva:
  ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
parents a515be1c e6bf7059

arch/arm/boot/dts/r8a7740-armadillo800eva.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * 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>;

	};

};

arch/arm/mach-shmobile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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"

arch/arm/mach-shmobile/board-armadillo800eva.c

+7 −1
Original line number Diff line number Diff line
@@ -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