From: t-kristo@ti.com (Tero Kristo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv3 7/9] ARM: OMAP: clockdomain: add support for preventing domain transitions
Date: Thu, 31 May 2012 16:29:00 +0300 [thread overview]
Message-ID: <1338470942-20185-8-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1338470942-20185-1-git-send-email-t-kristo@ti.com>
Some clockdomains can't support manual domain transitions triggered by
clock framework, and must be prevented from doing so. Added clkdm flag
CLKDM_SKIP_MANUAL_TRANS for doing this.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
arch/arm/mach-omap2/clockdomain.c | 6 ++++++
arch/arm/mach-omap2/clockdomain.h | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c
index c665348..fa652b5 100644
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c
@@ -948,6 +948,9 @@ static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm)
if ((clkdm_usecount_inc(clkdm) > 1) && autodeps)
return 0;
+ if (clkdm->flags & CLKDM_SKIP_MANUAL_TRANS)
+ return 0;
+
spin_lock_irqsave(&clkdm->lock, flags);
arch_clkdm->clkdm_clk_enable(clkdm);
pwrdm_state_switch(clkdm->pwrdm.ptr);
@@ -973,6 +976,9 @@ static int _clkdm_clk_hwmod_disable(struct clockdomain *clkdm)
if (clkdm_usecount_dec(clkdm) > 0)
return 0;
+ if (clkdm->flags & CLKDM_SKIP_MANUAL_TRANS)
+ return 0;
+
spin_lock_irqsave(&clkdm->lock, flags);
arch_clkdm->clkdm_clk_disable(clkdm);
pwrdm_state_switch(clkdm->pwrdm.ptr);
diff --git a/arch/arm/mach-omap2/clockdomain.h b/arch/arm/mach-omap2/clockdomain.h
index 373399a..35ac7ee 100644
--- a/arch/arm/mach-omap2/clockdomain.h
+++ b/arch/arm/mach-omap2/clockdomain.h
@@ -31,12 +31,15 @@
*
* CLKDM_NO_AUTODEPS: Prevent "autodeps" from being added/removed from this
* clockdomain. (Currently, this applies to OMAP3 clockdomains only.)
+ * CLKDM_SKIP_MANUAL_TRANS: Prevent clockdomain code from attempting to change
+ * clockdomain state manually. Needed for PER domain on omap3.
*/
#define CLKDM_CAN_FORCE_SLEEP (1 << 0)
#define CLKDM_CAN_FORCE_WAKEUP (1 << 1)
#define CLKDM_CAN_ENABLE_AUTO (1 << 2)
#define CLKDM_CAN_DISABLE_AUTO (1 << 3)
#define CLKDM_NO_AUTODEPS (1 << 4)
+#define CLKDM_SKIP_MANUAL_TRANS (1 << 5)
#define CLKDM_CAN_HWSUP (CLKDM_CAN_ENABLE_AUTO | CLKDM_CAN_DISABLE_AUTO)
#define CLKDM_CAN_SWSUP (CLKDM_CAN_FORCE_SLEEP | CLKDM_CAN_FORCE_WAKEUP)
--
1.7.4.1
next prev parent reply other threads:[~2012-05-31 13:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-31 13:28 [PATCHv3 0/9] ARM: OMAP3+: pwrdm changes for usecounting Tero Kristo
2012-05-31 13:28 ` [PATCHv3 1/9] ARM: OMAP: clk: add support for omap_clk_for_each Tero Kristo
2012-05-31 13:28 ` [PATCHv3 2/9] ARM: OMAP3+: voltage/pwrdm/clkdm/clock add recursive usecount tracking Tero Kristo
2012-06-01 10:13 ` Menon, Nishanth
2012-06-01 10:27 ` Paul Walmsley
2012-06-04 9:38 ` Tero Kristo
2012-05-31 13:28 ` [PATCHv3 3/9] ARM: OMAP3+: voltage: add support for voltagedomain usecounts Tero Kristo
2012-05-31 13:28 ` [PATCHv3 4/9] ARM: OMAP3: add manual control for mpu / core pwrdm usecounting Tero Kristo
2012-05-31 13:28 ` [PATCHv3 5/9] ARM: OMAP3: set autoidle flags for a few clocks Tero Kristo
2012-07-12 9:13 ` Rajendra Nayak
2012-07-12 15:32 ` Tero Kristo
2012-05-31 13:28 ` [PATCHv3 6/9] ARM: OMAP: pm-debug: enhanced usecount debug support Tero Kristo
2012-05-31 13:29 ` Tero Kristo [this message]
2012-05-31 13:29 ` [PATCHv3 8/9] ARM: OMAP3: prevent per_clkdm from attempting manual domain transitions Tero Kristo
2012-05-31 23:40 ` Jon Hunter
2012-06-01 8:06 ` Tero Kristo
2012-07-12 9:41 ` Rajendra Nayak
2012-07-12 15:35 ` Tero Kristo
2012-05-31 13:29 ` [PATCHv3 9/9] TEMP: ARM: OMAP3: prevent dpll4 manual enable / disable + prevent core clkdm idle Tero Kristo
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=1338470942-20185-8-git-send-email-t-kristo@ti.com \
--to=t-kristo@ti.com \
--cc=linux-arm-kernel@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).