Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / arm / mach-omap2 / prcm-common.h

diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h
index 87486f5..0363dcb 100644 (file)
--- a/arch/arm/mach-omap2/prcm-common.h
+++ b/arch/arm/mach-omap2/prcm-common.h
@@ -121,6 +121,10 @@
 #define OMAP24XX_ST_MCSPI2_MASK                                (1 << 18)
 #define OMAP24XX_ST_MCSPI1_SHIFT                       17
 #define OMAP24XX_ST_MCSPI1_MASK                                (1 << 17)
+#define OMAP24XX_ST_MCBSP2_SHIFT                       16
+#define OMAP24XX_ST_MCBSP2_MASK                                (1 << 16)
+#define OMAP24XX_ST_MCBSP1_SHIFT                       15
+#define OMAP24XX_ST_MCBSP1_MASK                                (1 << 15)
 #define OMAP24XX_ST_GPT12_SHIFT                                14
 #define OMAP24XX_ST_GPT12_MASK                         (1 << 14)
 #define OMAP24XX_ST_GPT11_SHIFT                                13
@@ -191,6 +195,8 @@
 #define OMAP3430_AUTOIDLE_MASK                         (1 << 0)
 
 /* CM_FCLKEN1_CORE, CM_ICLKEN1_CORE, PM_WKEN1_CORE shared bits */
+#define OMAP3430_EN_MMC3_MASK                          (1 << 30)
+#define OMAP3430_EN_MMC3_SHIFT                         30
 #define OMAP3430_EN_MMC2_MASK                          (1 << 25)
 #define OMAP3430_EN_MMC2_SHIFT                         25
 #define OMAP3430_EN_MMC1_MASK                          (1 << 24)
@@ -231,6 +237,8 @@
 #define OMAP3430_EN_HSOTGUSB_SHIFT                     4
 
 /* PM_WKST1_CORE, CM_IDLEST1_CORE shared bits */
+#define OMAP3430_ST_MMC3_SHIFT                         30
+#define OMAP3430_ST_MMC3_MASK                          (1 << 30)
 #define OMAP3430_ST_MMC2_SHIFT                         25
 #define OMAP3430_ST_MMC2_MASK                          (1 << 25)
 #define OMAP3430_ST_MMC1_SHIFT                         24