]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] OMAP2/3 clockdomains: autodeps should respect platform flags
authorPaul Walmsley <paul@pwsan.com>
Wed, 28 Jan 2009 02:44:35 +0000 (19:44 -0700)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 8 Feb 2009 17:50:31 +0000 (17:50 +0000)
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>
arch/arm/mach-omap2/clockdomain.c

index c9c367c39679783f55cd919cc271c8bb6252d6e3..ae0c53abb55aac8ac7f9cb19caf88b639b807746 100644 (file)
@@ -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);