summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2009-01-27 19:44:35 -0700
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 17:50:31 +0000
commitd96df00d6dfd2482fb23ef7aabcaa36e6dce4d1c (patch)
tree243ca4fc8a2fbdfdd63b0b760a493c1956435261
parent054ce503ae335dbc8610ef5aa0852c0c090023fe (diff)
downloadtalos-obmc-linux-d96df00d6dfd2482fb23ef7aabcaa36e6dce4d1c.tar.gz
talos-obmc-linux-d96df00d6dfd2482fb23ef7aabcaa36e6dce4d1c.zip
[ARM] OMAP2/3 clockdomains: autodeps should respect platform flags
Fix the clockdomain autodep code to respect omap_chip platform flags. Resolves "Unable to handle kernel paging request at virtual address 5f75706d" panic during power management initialization on OMAP2. 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/clockdomain.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c
index c9c367c39679..ae0c53abb55a 100644
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c
@@ -100,6 +100,9 @@ static void _clkdm_add_autodeps(struct clockdomain *clkdm)
if (IS_ERR(autodep->pwrdm.ptr))
continue;
+ if (!omap_chip_is(autodep->omap_chip))
+ continue;
+
pr_debug("clockdomain: adding %s sleepdep/wkdep for "
"pwrdm %s\n", autodep->pwrdm.ptr->name,
clkdm->pwrdm.ptr->name);
@@ -125,6 +128,9 @@ static void _clkdm_del_autodeps(struct clockdomain *clkdm)
if (IS_ERR(autodep->pwrdm.ptr))
continue;
+ if (!omap_chip_is(autodep->omap_chip))
+ continue;
+
pr_debug("clockdomain: removing %s sleepdep/wkdep for "
"pwrdm %s\n", autodep->pwrdm.ptr->name,
clkdm->pwrdm.ptr->name);
OpenPOWER on IntegriCloud