omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2

[safe/jmp/linux-2.6] / arch / arm / mach-omap2 / clockdomains.h

diff --git a/arch/arm/mach-omap2/clockdomains.h b/arch/arm/mach-omap2/clockdomains.h
index 9629ef1..8fc19ff 100644 (file)
--- a/arch/arm/mach-omap2/clockdomains.h
+++ b/arch/arm/mach-omap2/clockdomains.h
@@ -1,8 +1,8 @@
 /*
  * OMAP2/3 clockdomains
  *
- * Copyright (C) 2008 Texas Instruments, Inc.
- * Copyright (C) 2008-2009 Nokia Corporation
+ * Copyright (C) 2008-2009 Texas Instruments, Inc.
+ * Copyright (C) 2008-2010 Nokia Corporation
  *
  * Written by Paul Walmsley and Jouni Högander
  *
@@ -84,7 +84,7 @@ static struct clkdm_dep gfx_sgx_wkdeps[] = {
 
 /* 24XX-specific possible dependencies */
 
-#ifdef CONFIG_ARCH_OMAP24XX
+#ifdef CONFIG_ARCH_OMAP2
 
 /* Wakeup dependency source arrays */
 
@@ -110,10 +110,10 @@ static struct clkdm_dep dsp_24xx_wkdeps[] = {
 };
 
 /*
- * 2420/2430 PM_WKDEP_MDM: CORE, MPU, WKUP
- * XXX This is probably 2430-only; 2420 did not have a stacked modem config.
+ * 2420 PM_WKDEP_MPU: CORE, DSP, WKUP
+ * 2430 adds MDM
  */
-static struct clkdm_dep mdm_24xx_wkdeps[] = {
+static struct clkdm_dep mpu_24xx_wkdeps[] = {
        {
                .clkdm_name = "core_l3_clkdm",
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
@@ -123,31 +123,35 @@ static struct clkdm_dep mdm_24xx_wkdeps[] = {
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
        },
        {
-               .clkdm_name = "mpu_clkdm",
+               .clkdm_name = "dsp_clkdm",
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
        },
        {
                .clkdm_name = "wkup_clkdm",
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
        },
+       {
+               .clkdm_name = "mdm_clkdm",
+               .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430)
+       },
        { NULL },
 };
 
 /*
- * 2420 PM_WKDEP_MPU: CORE, DSP, WKUP
+ * 2420 PM_WKDEP_CORE: DSP, GFX, MPU, WKUP
  * 2430 adds MDM
  */
-static struct clkdm_dep mpu_24xx_wkdeps[] = {
+static struct clkdm_dep core_24xx_wkdeps[] = {
        {
-               .clkdm_name = "core_l3_clkdm",
+               .clkdm_name = "dsp_clkdm",
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
        },
        {
-               .clkdm_name = "core_l4_clkdm",
+               .clkdm_name = "gfx_clkdm",
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
        },
        {
-               .clkdm_name = "dsp_clkdm",
+               .clkdm_name = "mpu_clkdm",
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
        },
        {
@@ -161,17 +165,21 @@ static struct clkdm_dep mpu_24xx_wkdeps[] = {
        { NULL },
 };
 
-/*
- * 2420 PM_WKDEP_CORE: DSP, GFX, MPU, WKUP
- * 2430 adds MDM
- */
-static struct clkdm_dep core_24xx_wkdeps[] = {
+#endif
+
+
+/* 2430-specific possible wakeup dependencies */
+
+#ifdef CONFIG_ARCH_OMAP2430
+
+/* 2430 PM_WKDEP_MDM: CORE, MPU, WKUP */
+static struct clkdm_dep mdm_2430_wkdeps[] = {
        {
-               .clkdm_name = "dsp_clkdm",
+               .clkdm_name = "core_l3_clkdm",
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
        },
        {
-               .clkdm_name = "gfx_clkdm",
+               .clkdm_name = "core_l4_clkdm",
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
        },
        {
@@ -182,18 +190,15 @@ static struct clkdm_dep core_24xx_wkdeps[] = {
                .clkdm_name = "wkup_clkdm",
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX)
        },
-       {
-               .clkdm_name = "mdm_clkdm",
-               .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430)
-       },
        { NULL },
 };
 
-#endif
+#endif /* CONFIG_ARCH_OMAP2430 */
+
 
-/* 34XX-specific possible dependencies */
+/* OMAP3-specific possible dependencies */
 
-#ifdef CONFIG_ARCH_OMAP34XX
+#ifdef CONFIG_ARCH_OMAP3
 
 /* 3430: PM_WKDEP_PER: CORE, IVA2, MPU, WKUP */
 static struct clkdm_dep per_wkdeps[] = {
@@ -246,7 +251,7 @@ static struct clkdm_dep usbhost_wkdeps[] = {
 };
 
 /* 3430 PM_WKDEP_MPU: CORE, IVA2, DSS, PER */
-static struct clkdm_dep mpu_34xx_wkdeps[] = {
+static struct clkdm_dep mpu_3xxx_wkdeps[] = {
        {
                .clkdm_name = "core_l3_clkdm",
                .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
@@ -344,7 +349,7 @@ static struct clkdm_dep neon_wkdeps[] = {
 };
 
 
-/* Sleep dependency source arrays for 34xx-specific clkdms - 34XX only */
+/* Sleep dependency source arrays for OMAP3-specific clkdms */
 
 /* 3430: CM_SLEEPDEP_DSS: MPU, IVA */
 static struct clkdm_dep dss_sleepdeps[] = {
@@ -408,7 +413,7 @@ static struct clkdm_dep gfx_sgx_sleepdeps[] = {
        { NULL },
 };
 
-#endif /* CONFIG_ARCH_OMAP34XX */
+#endif /* CONFIG_ARCH_OMAP3 */
 
 
 /*
@@ -420,7 +425,7 @@ static struct clkdm_dep gfx_sgx_sleepdeps[] = {
  * sys_clkout/sys_clkout2.
  */
 
-#if defined(CONFIG_ARCH_OMAP24XX) | defined(CONFIG_ARCH_OMAP34XX)
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 
 /* This is an implicit clockdomain - it is never defined as such in TRM */
 static struct clockdomain wkup_clkdm = {
@@ -549,7 +554,7 @@ static struct clockdomain mdm_clkdm = {
        .clkstctrl_reg  = OMAP2430_CM_REGADDR(OMAP2430_MDM_MOD,
                                                 OMAP2_CM_CLKSTCTRL),
        .dep_bit        = OMAP2430_PM_WKDEP_MPU_EN_MDM_SHIFT,
-       .wkdep_srcs     = mdm_24xx_wkdeps,
+       .wkdep_srcs     = mdm_2430_wkdeps,
        .clktrctrl_mask = OMAP2430_AUTOSTATE_MDM_MASK,
        .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
 };
@@ -621,18 +626,18 @@ static struct clockdomain dss_2430_clkdm = {
 
 
 /*
- * 34xx clockdomains
+ * OMAP3 clockdomains
  */
 
-#if defined(CONFIG_ARCH_OMAP34XX)
+#if defined(CONFIG_ARCH_OMAP3)
 
-static struct clockdomain mpu_34xx_clkdm = {
+static struct clockdomain mpu_3xxx_clkdm = {
        .name           = "mpu_clkdm",
        .pwrdm          = { .name = "mpu_pwrdm" },
        .flags          = CLKDM_CAN_HWSUP | CLKDM_CAN_FORCE_WAKEUP,
        .clkstctrl_reg  = OMAP34XX_CM_REGADDR(MPU_MOD, OMAP2_CM_CLKSTCTRL),
        .dep_bit        = OMAP3430_EN_MPU_SHIFT,
-       .wkdep_srcs     = mpu_34xx_wkdeps,
+       .wkdep_srcs     = mpu_3xxx_wkdeps,
        .clktrctrl_mask = OMAP3430_CLKTRCTRL_MPU_MASK,
        .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
 };
@@ -701,10 +706,10 @@ static struct clockdomain d2d_clkdm = {
 
 /*
  * XXX add usecounting for clkdm dependencies, otherwise the presence
- * of a single dep bit for core_l3_34xx_clkdm and core_l4_34xx_clkdm
+ * of a single dep bit for core_l3_3xxx_clkdm and core_l4_3xxx_clkdm
  * could cause trouble
  */
-static struct clockdomain core_l3_34xx_clkdm = {
+static struct clockdomain core_l3_3xxx_clkdm = {
        .name           = "core_l3_clkdm",
        .pwrdm          = { .name = "core_pwrdm" },
        .flags          = CLKDM_CAN_HWSUP,
@@ -716,10 +721,10 @@ static struct clockdomain core_l3_34xx_clkdm = {
 
 /*
  * XXX add usecounting for clkdm dependencies, otherwise the presence
- * of a single dep bit for core_l3_34xx_clkdm and core_l4_34xx_clkdm
+ * of a single dep bit for core_l3_3xxx_clkdm and core_l4_3xxx_clkdm
  * could cause trouble
  */
-static struct clockdomain core_l4_34xx_clkdm = {
+static struct clockdomain core_l4_3xxx_clkdm = {
        .name           = "core_l4_clkdm",
        .pwrdm          = { .name = "core_pwrdm" },
        .flags          = CLKDM_CAN_HWSUP,
@@ -730,7 +735,7 @@ static struct clockdomain core_l4_34xx_clkdm = {
 };
 
 /* Another case of bit name collisions between several registers: EN_DSS */
-static struct clockdomain dss_34xx_clkdm = {
+static struct clockdomain dss_3xxx_clkdm = {
        .name           = "dss_clkdm",
        .pwrdm          = { .name = "dss_pwrdm" },
        .flags          = CLKDM_CAN_HWSUP_SWSUP,
@@ -824,12 +829,12 @@ static struct clockdomain dpll5_clkdm = {
        .omap_chip      = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
 };
 
-#endif   /* CONFIG_ARCH_OMAP34XX */
+#endif   /* CONFIG_ARCH_OMAP3 */
 
 #include "clockdomains44xx.h"
 
 /*
- * Clockdomain hwsup dependencies (34XX only)
+ * Clockdomain hwsup dependencies (OMAP3 only)
  */
 
 static struct clkdm_autodep clkdm_autodeps[] = {
@@ -852,7 +857,7 @@ static struct clkdm_autodep clkdm_autodeps[] = {
 
 static struct clockdomain *clockdomains_omap[] = {
 
-#if defined(CONFIG_ARCH_OMAP24XX) | defined(CONFIG_ARCH_OMAP34XX)
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
        &wkup_clkdm,
        &cm_clkdm,
        &prm_clkdm,
@@ -878,16 +883,16 @@ static struct clockdomain *clockdomains_omap[] = {
        &dss_2430_clkdm,
 #endif
 
-#ifdef CONFIG_ARCH_OMAP34XX
-       &mpu_34xx_clkdm,
+#ifdef CONFIG_ARCH_OMAP3
+       &mpu_3xxx_clkdm,
        &neon_clkdm,
        &iva2_clkdm,
        &gfx_3430es1_clkdm,
        &sgx_clkdm,
        &d2d_clkdm,
-       &core_l3_34xx_clkdm,
-       &core_l4_34xx_clkdm,
-       &dss_34xx_clkdm,
+       &core_l3_3xxx_clkdm,
+       &core_l4_3xxx_clkdm,
+       &dss_3xxx_clkdm,
        &cam_clkdm,
        &usbhost_clkdm,
        &per_clkdm,