From: Tony Lindgren <tony@atomide.com>
To: "Jouni Högander" <jouni.hogander@nokia.com>
Cc: linux-omap@vger.kernel.org
Subject: Re: [PATCH] PRCM: 34XX: Fixes to ssi clock handling
Date: Mon, 14 Apr 2008 11:09:32 -0700 [thread overview]
Message-ID: <20080414180932.GH26832@atomide.com> (raw)
In-Reply-To: <1208178371-18752-1-git-send-email-jouni.hogander@nokia.com>
* Jouni Högander <jouni.hogander@nokia.com> [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@nokia.com>
> ---
> 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@vger.kernel.org
> 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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2008-04-14 18:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-14 13:06 [PATCH] PRCM: 34XX: Fixes to ssi clock handling Jouni Högander
2008-04-14 18:09 ` Tony Lindgren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080414180932.GH26832@atomide.com \
--to=tony@atomide.com \
--cc=jouni.hogander@nokia.com \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.