REMOVE OMAP LEGACY CODE: Reset clocks and PM code to mainline

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / clockdomains.h

diff --git a/arch/arm/mach-omap2/clockdomains.h b/arch/arm/mach-omap2/clockdomains.h
index a21df93a07fdccdecb4fe44ec45c73c24db5d1f2..281d5da1918879a2ca927ee4616cbfb495a4fdbc 100644 (file)
--- a/arch/arm/mach-omap2/clockdomains.h
+++ b/arch/arm/mach-omap2/clockdomains.h
@@ -21,6 +21,13 @@
  * sys_clkout/sys_clkout2.
  */
 
+/* This is an implicit clockdomain - it is never defined as such in TRM */
+static struct clockdomain wkup_clkdm = {
+       .name           = "wkup_clkdm",
+       .pwrdm          = { .name = "wkup_pwrdm" },
+       .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),
+};
+
 static struct clockdomain prm_clkdm = {
        .name           = "prm_clkdm",
        .pwrdm          = { .name = "wkup_pwrdm" },
@@ -33,16 +40,6 @@ static struct clockdomain cm_clkdm = {
        .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),
 };
 
-/*
- * virt_opp_clkdm is intended solely for use with virtual OPP clocks,
- * e.g., virt_prcm_set, until OPP handling is rationalized.
- */
-static struct clockdomain virt_opp_clkdm = {
-       .name           = "virt_opp_clkdm",
-       .pwrdm          = { .name = "wkup_pwrdm" },
-       .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),
-};
-
 /*
  * 2420-only clockdomains
  */
@@ -319,9 +316,9 @@ static struct clkdm_pwrdm_autodep clkdm_pwrdm_autodeps[] = {
 
 static struct clockdomain *clockdomains_omap[] = {
 
+       &wkup_clkdm,
        &cm_clkdm,
        &prm_clkdm,
-       &virt_opp_clkdm,
 
 #ifdef CONFIG_ARCH_OMAP2420
        &mpu_2420_clkdm,