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

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

ARM: OMAP3: Fix hardware detection for omap3630 when booted with device tree 



SoC family definitions at the moment are reactive to board needs
as a result, beagle-xm would matchup with ti,omap3 which invokes
omap3430_init_early instead of omap3630_init_early. Obviously, this is
the wrong behavior.

With clock node dts conversion, we get the following warnings before
system hangs as a result and 3630 based platforms fails to boot
(uart4 clocks are only present in OMAP3630 and not present in
OMAP3430):

...
omap_hwmod: uart4: cannot clk_get main_clk uart4_fck
omap_hwmod: uart4: cannot _init_clocks

WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/omap_hwmod.c:2434
_init+0x6c/0x80()
omap_hwmod: uart4: couldn't init clocks
...

WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/omap_hwmod.c:2126
_enable+0x254/0x280()
omap_hwmod: timer12: enabled state can only be entered from
initialized, idle, or disabled state
...

WARNING: CPU: 0 PID: 46 at arch/arm/mach-omap2/omap_hwmod.c:2224
_idle+0xd4/0xf8()
omap_hwmod: timer12: idle state can only be entered from enabled state

WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/omap_hwmod.c:2126
_enable+0x254/0x280()
omap_hwmod: uart4: enabled state can only be entered from
initialized, idle, or disabled state

So, add specific compatiblity for 3630 to allow match for Beagle-XM
platform.

Signed-off-by: default avatarNishanth Menon <nm@ti.com>
[tony@atomide.com: left out ti,omap343x, updated comments]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1dc1c338

arch/arm/boot/dts/omap3-beagle-xm.dts

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


/ {

	model = "TI OMAP3 BeagleBoard xM";

	compatible = "ti,omap3-beagle-xm", "ti,omap3-beagle", "ti,omap3";

	compatible = "ti,omap3-beagle-xm", "ti,omap36xx", "ti,omap3";



	cpus {

		cpu@0 {

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

+18 −0
Original line number Diff line number Diff line
@@ -129,6 +129,24 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.restart	= omap3xxx_restart,

MACHINE_END



static const char *omap36xx_boards_compat[] __initdata = {

	"ti,omap36xx",

	NULL,

};



DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)")

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap3630_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_sync32k_timer_init,

	.dt_compat	= omap36xx_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END



static const char *omap3_gp_boards_compat[] __initdata = {

	"ti,omap3-beagle",

	"timll,omap3-devkit8000",