* Jouni Högander <jouni.hogander@xxxxxxxxx> [080414 06:23]:
> ssi_l4_ick should have PARENT_CONTROLS_CLOCK flag.
> ST_SSI_STDBY bit in idlest register cannot be used in omap2_clk_wait_ready
Pushing today.
Tony
> Signed-off-by: Jouni Högander <jouni.hogander@xxxxxxxxx>
> ---
> arch/arm/mach-omap2/clock.c | 4 +++-
> arch/arm/mach-omap2/clock34xx.h | 3 ++-
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
> index dead756..e7e8576 100644
> --- a/arch/arm/mach-omap2/clock.c
> +++ b/arch/arm/mach-omap2/clock.c
> @@ -212,7 +212,9 @@ static void omap2_clk_wait_ready(struct clk *clk, int enable)
> /* 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;
>
> bit = 1 << clk->enable_bit;
> diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
> index fc03999..9ca2cdf 100644
> --- a/arch/arm/mach-omap2/clock34xx.h
> +++ b/arch/arm/mach-omap2/clock34xx.h
> @@ -1917,7 +1917,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,
> };
>
> --
> 1.5.3.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
