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

Commit 090830b4 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Tony Lindgren
Browse files

OMAP4: clock: Fix multi-omap boot with reset un-used clocks 



This patch uses "ENABLE_ON_INIT" flag on the emif clock nodes
to avoid the emif clk getting cut as part of reset un-used clock
routine which prevents boot.

Since "omap4xxx_clk_init()" calls "clk_enable_init_clocks()"
which increases the usecount on all ENABLE_ON_INIT clocks, it
prevents "omap2_clk_disable_unused()" from disabling the clock.

The real fix is to have driver for EMIF and do clock get/enable
as part of it. The EMIF driver is planned to be done HWMOD way
so till that available to keep omap3_defconfig booting on OMAP4430,
this patch is necessary.
(Will updated the auto-gen script for 44xx accordingly)

The fix was suggested by Paul Walmsley

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 0b96a3a3

arch/arm/mach-omap2/clock44xx_data.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1369,6 +1369,7 @@ static struct clk emif1_ick = { 
	.ops		= &clkops_omap2_dflt,

	.ops		= &clkops_omap2_dflt,

	.enable_reg	= OMAP4430_CM_MEMIF_EMIF_1_CLKCTRL,

	.enable_reg	= OMAP4430_CM_MEMIF_EMIF_1_CLKCTRL,

	.enable_bit	= OMAP4430_MODULEMODE_HWCTRL,

	.enable_bit	= OMAP4430_MODULEMODE_HWCTRL,

	.flags		= ENABLE_ON_INIT,

	.clkdm_name	= "l3_emif_clkdm",

	.clkdm_name	= "l3_emif_clkdm",

	.parent		= &ddrphy_ck,

	.parent		= &ddrphy_ck,

	.recalc		= &followparent_recalc,

	.recalc		= &followparent_recalc,
@@ -1379,6 +1380,7 @@ static struct clk emif2_ick = { 
	.ops		= &clkops_omap2_dflt,

	.ops		= &clkops_omap2_dflt,

	.enable_reg	= OMAP4430_CM_MEMIF_EMIF_2_CLKCTRL,

	.enable_reg	= OMAP4430_CM_MEMIF_EMIF_2_CLKCTRL,

	.enable_bit	= OMAP4430_MODULEMODE_HWCTRL,

	.enable_bit	= OMAP4430_MODULEMODE_HWCTRL,

	.flags		= ENABLE_ON_INIT,

	.clkdm_name	= "l3_emif_clkdm",

	.clkdm_name	= "l3_emif_clkdm",

	.parent		= &ddrphy_ck,

	.parent		= &ddrphy_ck,

	.recalc		= &followparent_recalc,

	.recalc		= &followparent_recalc,