OMAP3 powerdomains: remove RET from SGX power states list

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / pm34xx.c

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index a828db63747d94a0f3801c4467bf074161c5f24e..da098d24d133f3ddc09477bbe690b0499f564365 100644 (file)
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -109,7 +109,7 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)
                cm_write_mod_reg(fclk, OMAP3430_PER_MOD, CM_FCLKEN);
        }
 
-       if (system_rev > OMAP3430_REV_ES1_0) {
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
                /* USBHOST */
                wkst = prm_read_mod_reg(OMAP3430ES2_USBHOST_MOD, PM_WKST);
                if (wkst) {
@@ -194,7 +194,7 @@ static int omap3_fclks_active(void)
 
        fck_core1 = cm_read_mod_reg(CORE_MOD,
                                    CM_FCLKEN1);
-       if (system_rev > OMAP3430_REV_ES1_0) {
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
                fck_core3 = cm_read_mod_reg(CORE_MOD,
                                            OMAP3430ES2_CM_FCLKEN3);
                fck_sgx = cm_read_mod_reg(OMAP3430ES2_SGX_MOD,
@@ -368,7 +368,7 @@ static void __init prcm_setup_regs(void)
        prm_write_mod_reg(0, OMAP3430_NEON_MOD, PM_WKDEP);
        prm_write_mod_reg(0, OMAP3430_CAM_MOD, PM_WKDEP);
        prm_write_mod_reg(0, OMAP3430_PER_MOD, PM_WKDEP);
-       if (system_rev > OMAP3430_REV_ES1_0) {
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
                prm_write_mod_reg(0, OMAP3430ES2_SGX_MOD, PM_WKDEP);
                prm_write_mod_reg(0, OMAP3430ES2_USBHOST_MOD, PM_WKDEP);
        } else
@@ -418,7 +418,7 @@ static void __init prcm_setup_regs(void)
                OMAP3430_AUTO_DES1,
                CORE_MOD, CM_AUTOIDLE2);
 
-       if (system_rev > OMAP3430_REV_ES1_0) {
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
                cm_write_mod_reg(
                        OMAP3430ES2_AUTO_USBTLL,
                        CORE_MOD, CM_AUTOIDLE3);
@@ -465,7 +465,7 @@ static void __init prcm_setup_regs(void)
                OMAP3430_PER_MOD,
                CM_AUTOIDLE);
 
-       if (system_rev > OMAP3430_REV_ES1_0) {
+       if (omap_rev() > OMAP3430_REV_ES1_0) {
                cm_write_mod_reg(
                        OMAP3430ES2_AUTO_USBHOST,
                        OMAP3430ES2_USBHOST_MOD,
@@ -540,7 +540,7 @@ static int __init clkdms_setup(struct clockdomain *clkdm)
 
 int __init omap3_pm_init(void)
 {
-       struct power_state *pwrst;
+       struct power_state *pwrst, *tmp;
        int ret;
 
        printk(KERN_ERR "Power Management for TI OMAP3.\n");
@@ -583,7 +583,7 @@ err1:
        return ret;
 err2:
        free_irq(INT_34XX_PRCM_MPU_IRQ, NULL);
-       list_for_each_entry(pwrst, &pwrst_list, node) {
+       list_for_each_entry_safe(pwrst, tmp, &pwrst_list, node) {
                list_del(&pwrst->node);
                kfree(pwrst);
        }
@@ -622,10 +622,7 @@ static void __init configure_vc(void)
                                OMAP3_PRM_VC_I2C_CFG_OFFSET);
 
        /* Setup voltctrl and other setup times */
-
-#ifdef CONFIG_OMAP_SYSOFFMODE
-       prm_write_mod_reg(OMAP3430_AUTO_OFF | OMAP3430_AUTO_RET |
-                       OMAP3430_SEL_OFF, OMAP3430_GR_MOD,
+       prm_write_mod_reg(OMAP3430_AUTO_RET, OMAP3430_GR_MOD,
                        OMAP3_PRM_VOLTCTRL_OFFSET);
 
        prm_write_mod_reg(OMAP3430_CLKSETUP_DURATION, OMAP3430_GR_MOD,
@@ -640,11 +637,6 @@ static void __init configure_vc(void)
                        OMAP3_PRM_VOLTOFFSET_OFFSET);
        prm_write_mod_reg(OMAP3430_VOLTSETUP2_DURATION, OMAP3430_GR_MOD,
                        OMAP3_PRM_VOLTSETUP2_OFFSET);
-#else
-       prm_set_mod_reg_bits(OMAP3430_AUTO_RET, OMAP3430_GR_MOD,
-                       OMAP3_PRM_VOLTCTRL_OFFSET);
-#endif
-
 }
 
 static int __init omap3_pm_early_init(void)