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

Commit caef4ee8 authored by Nishanth Menon's avatar Nishanth Menon Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Fix the machine entry for am3517 



The am3517 is wrongly booting as omap3 which means that the am3517
specific devices like Ethernet won't work when booted with device
tree. Now with the new devices defined in am3517.dtsi, let's use
that instead of the omap3.dtsi, and add a separate machine entry
for am3517 so am3517-evm can use it.

Signed-off-by: default avatarNishanth Menon <nm@ti.com>
[tony@atomide.com: updated comments and fixed build without omap3]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a0158185

arch/arm/boot/dts/am3517-evm.dts

+3 −3
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
 */

/dts-v1/;



#include "omap34xx.dtsi"

#include "am3517.dtsi"



/ {

	model = "TI AM3517 EVM (AM3517/05)";

	compatible = "ti,am3517-evm", "ti,omap3";

	model = "TI AM3517 EVM (AM3517/05 TMDSEVM3517)";

	compatible = "ti,am3517-evm", "ti,am3517", "ti,omap3";



	memory {

		device_type = "memory";

arch/arm/mach-omap2/board-generic.c

+18 −0
Original line number Diff line number Diff line
@@ -131,6 +131,24 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)") 
	.dt_compat	= omap3_gp_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END



static const char *am3517_boards_compat[] __initdata = {

	"ti,am3517",

	NULL,

};



DT_MACHINE_START(AM3517_DT, "Generic AM3517 (Flattened Device Tree)")

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= am35xx_init_early,

	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_gptimer_timer_init,

	.dt_compat	= am3517_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END

#endif



#ifdef CONFIG_SOC_AM33XX