summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Hogander2009-01-28 03:44:38 +0100
committerRussell King2009-02-08 18:50:32 +0100
commitf266950d0234599cc6d4a5602e43d0fb782de1d2 (patch)
tree978509f8a4b7aeca5070b2da3cc9fbc77a891404
parent[ARM] OMAP2/3 clockdomains: autodeps should respect platform flags (diff)
downloadkernel-qcow2-linux-f266950d0234599cc6d4a5602e43d0fb782de1d2.tar.gz
kernel-qcow2-linux-f266950d0234599cc6d4a5602e43d0fb782de1d2.tar.xz
kernel-qcow2-linux-f266950d0234599cc6d4a5602e43d0fb782de1d2.zip
[ARM] OMAP3: PM: Emu_pwrdm is switched off by hardware even when sdti is in use
Using sdti doesn't keep emu_pwrdm on if hardware supervised pwrdm transitions are used. This causes sdti stop to work when power management is initialized and hardware supervised pwrdm control is enabled. This patch disables hardware supervised pwrdm control for emu_pwrdm. Now emu_pwrdm is switched off on boot by software when it is not used. Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com> Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-omap2/clockdomains.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clockdomains.h b/arch/arm/mach-omap2/clockdomains.h
index 9eb734328107..d7db796403dc 100644
--- a/arch/arm/mach-omap2/clockdomains.h
+++ b/arch/arm/mach-omap2/clockdomains.h
@@ -248,10 +248,14 @@ static struct clockdomain per_clkdm = {
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
};
+/*
+ * Disable hw supervised mode for emu_clkdm, because emu_pwrdm is
+ * switched of even if sdti is in use
+ */
static struct clockdomain emu_clkdm = {
.name = "emu_clkdm",
.pwrdm = { .name = "emu_pwrdm" },
- .flags = CLKDM_CAN_ENABLE_AUTO | CLKDM_CAN_SWSUP,
+ .flags = /* CLKDM_CAN_ENABLE_AUTO | */CLKDM_CAN_SWSUP,
.clktrctrl_mask = OMAP3430_CLKTRCTRL_EMU_MASK,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
};