Merge branch 'master' into for-linus

[pandora-kernel.git] / arch / arm / mach-omap2 / pm34xx.c

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index dd09d80..2e96771 100644 (file)
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -867,7 +867,7 @@ static void __init prcm_setup_regs(void)
                        CM_AUTOIDLE);
        }
 
-       omap_ctrl_writel(OMAP3430_AUTOIDLE, OMAP2_CONTROL_SYSCONFIG);
+       omap_ctrl_writel(OMAP3430_AUTOIDLE_MASK, OMAP2_CONTROL_SYSCONFIG);
 
        /*
         * Set all plls to autoidle. This is needed until autoidle is
@@ -897,12 +897,13 @@ static void __init prcm_setup_regs(void)
                             OMAP3_PRM_CLKSRC_CTRL_OFFSET);
 
        /* setup wakup source */
-       prm_write_mod_reg(OMAP3430_EN_IO_MASK | OMAP3430_EN_GPIO1 |
-                         OMAP3430_EN_GPT1 | OMAP3430_EN_GPT12,
+       prm_write_mod_reg(OMAP3430_EN_IO_MASK | OMAP3430_EN_GPIO1_MASK |
+                         OMAP3430_EN_GPT1_MASK | OMAP3430_EN_GPT12_MASK,
                          WKUP_MOD, PM_WKEN);
        /* No need to write EN_IO, that is always enabled */
-       prm_write_mod_reg(OMAP3430_EN_GPIO1 | OMAP3430_EN_GPT1 |
-                         OMAP3430_EN_GPT12,
+       prm_write_mod_reg(OMAP3430_GRPSEL_GPIO1_MASK |
+                         OMAP3430_GRPSEL_GPT1_MASK |
+                         OMAP3430_GRPSEL_GPT12_MASK,
                          WKUP_MOD, OMAP3430_PM_MPUGRPSEL);
        /* For some reason IO doesn't generate wakeup event even if
         * it is selected to mpu wakeup goup */
@@ -914,18 +915,22 @@ static void __init prcm_setup_regs(void)
                                OMAP3430_DSS_MOD, PM_WKEN);
 
        /* Enable wakeups in PER */
-       prm_write_mod_reg(OMAP3430_EN_GPIO2 | OMAP3430_EN_GPIO3 |
-                         OMAP3430_EN_GPIO4 | OMAP3430_EN_GPIO5 |
-                         OMAP3430_EN_GPIO6 | OMAP3430_EN_UART3 |
-                         OMAP3430_EN_MCBSP2 | OMAP3430_EN_MCBSP3 |
-                         OMAP3430_EN_MCBSP4,
+       prm_write_mod_reg(OMAP3430_EN_GPIO2_MASK | OMAP3430_EN_GPIO3_MASK |
+                         OMAP3430_EN_GPIO4_MASK | OMAP3430_EN_GPIO5_MASK |
+                         OMAP3430_EN_GPIO6_MASK | OMAP3430_EN_UART3_MASK |
+                         OMAP3430_EN_MCBSP2_MASK | OMAP3430_EN_MCBSP3_MASK |
+                         OMAP3430_EN_MCBSP4_MASK,
                          OMAP3430_PER_MOD, PM_WKEN);
        /* and allow them to wake up MPU */
-       prm_write_mod_reg(OMAP3430_GRPSEL_GPIO2_MASK | OMAP3430_EN_GPIO3 |
-                         OMAP3430_GRPSEL_GPIO4_MASK | OMAP3430_EN_GPIO5 |
-                         OMAP3430_GRPSEL_GPIO6_MASK | OMAP3430_EN_UART3 |
-                         OMAP3430_EN_MCBSP2 | OMAP3430_EN_MCBSP3 |
-                         OMAP3430_EN_MCBSP4,
+       prm_write_mod_reg(OMAP3430_GRPSEL_GPIO2_MASK |
+                         OMAP3430_GRPSEL_GPIO3_MASK |
+                         OMAP3430_GRPSEL_GPIO4_MASK |
+                         OMAP3430_GRPSEL_GPIO5_MASK |
+                         OMAP3430_GRPSEL_GPIO6_MASK |
+                         OMAP3430_GRPSEL_UART3_MASK |
+                         OMAP3430_GRPSEL_MCBSP2_MASK |
+                         OMAP3430_GRPSEL_MCBSP3_MASK |
+                         OMAP3430_GRPSEL_MCBSP4_MASK,
                          OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL);
 
        /* Don't attach IVA interrupts */