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

Commit 1971a390 authored by Jouni Högander's avatar Jouni Högander Committed by Tony Lindgren
Browse files

ARM: OMAP: PRCM fixes to ssi clock handling 



ssi_l4_ick should have PARENT_CONTROLS_CLOCK flag.
ST_SSI_STDBY bit in idlest register cannot be used in  omap2_clk_wait_ready

Signed-off-by: default avatarJouni Högander <jouni.hogander@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 31c203d4

arch/arm/mach-omap2/clock.c

+3 −1
Original line number Diff line number Diff line
@@ -205,7 +205,9 @@ static void omap2_clk_wait_ready(struct clk *clk) 
	/* REVISIT: What are the appropriate exclusions for 34XX? */

	/* OMAP3: ignore DSS-mod clocks */

	if (cpu_is_omap34xx() &&

	    (((u32)reg & ~0xff) == (u32)OMAP_CM_REGADDR(OMAP3430_DSS_MOD, 0)))

	    (((u32)reg & ~0xff) == (u32)OMAP_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||

	     ((((u32)reg & ~0xff) == (u32)OMAP_CM_REGADDR(CORE_MOD, 0)) &&

	     clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))

		return;



	/* Check if both functional and interface clocks

arch/arm/mach-omap2/clock34xx.h

+2 −1
Original line number Diff line number Diff line
@@ -1837,7 +1837,8 @@ static struct clk omapctrl_ick = { 
static struct clk ssi_l4_ick = {

	.name		= "ssi_l4_ick",

	.parent		= &l4_ick,

	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES,

	.flags		= CLOCK_IN_OMAP343X | RATE_PROPAGATES |

				PARENT_CONTROLS_CLOCK,

	.recalc		= &followparent_recalc,

};