Merge branch 'omap-all' into devel

Conflicts:

	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/irq.c

1 files changed, 8 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/prm-regbits-24xx.h b/arch/arm/mach-omap2/prm-regbits-24xx.h
index c6d17a3378ec..4002051c20b9 100644
--- a/arch/arm/mach-omap2/prm-regbits-24xx.h
+++ b/arch/arm/mach-omap2/prm-regbits-24xx.h
@@ -29,8 +29,10 @@
 #define OMAP24XX_WKUP1_EN                               (1 << 0)
 
 /* PM_WKDEP_GFX, PM_WKDEP_MPU, PM_WKDEP_DSP, PM_WKDEP_MDM shared bits */
-#define OMAP24XX_EN_MPU                                 (1 << 1)
-#define OMAP24XX_EN_CORE                                (1 << 0)
+#define OMAP24XX_EN_MPU_SHIFT                           1
+#define OMAP24XX_EN_MPU_MASK                            (1 << 1)
+#define OMAP24XX_EN_CORE_SHIFT                          0
+#define OMAP24XX_EN_CORE_MASK                           (1 << 0)
 
 /*
  * PM_PWSTCTRL_MPU, PM_PWSTCTRL_GFX, PM_PWSTCTRL_DSP, PM_PWSTCTRL_MDM
@@ -140,8 +142,10 @@
 /* 2430 calls GLOBALWMPU_RST "GLOBALWARM_RST" instead */
 
 /* PM_WKDEP_MPU specific bits */
-#define OMAP2430_PM_WKDEP_MPU_EN_MDM                    (1 << 5)
-#define OMAP24XX_PM_WKDEP_MPU_EN_DSP                    (1 << 2)
+#define OMAP2430_PM_WKDEP_MPU_EN_MDM_SHIFT              5
+#define OMAP2430_PM_WKDEP_MPU_EN_MDM_MASK               (1 << 5)
+#define OMAP24XX_PM_WKDEP_MPU_EN_DSP_SHIFT              2
+#define OMAP24XX_PM_WKDEP_MPU_EN_DSP_MASK               (1 << 2)
 
 /* PM_EVGENCTRL_MPU specific bits */