Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-omap2 / cm-regbits-24xx.h

diff --git a/arch/arm/mach-omap2/cm-regbits-24xx.h b/arch/arm/mach-omap2/cm-regbits-24xx.h
index da51cc3ed7eb310b771b805d8b22be2b1f8bd6f2..d70660e82fe600f36475f87132cfb893068fd7e4 100644 (file)
--- a/arch/arm/mach-omap2/cm-regbits-24xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-24xx.h
@@ -14,8 +14,6 @@
  * published by the Free Software Foundation.
  */
 
-#include "cm.h"
-
 /* Bits shared between registers */
 
 /* CM_FCLKEN1_CORE and CM_ICLKEN1_CORE shared bits */
@@ -126,8 +124,12 @@
 #define OMAP24XX_ST_HDQ_MASK                           (1 << 23)
 #define OMAP2420_ST_I2C2_SHIFT                         20
 #define OMAP2420_ST_I2C2_MASK                          (1 << 20)
+#define OMAP2430_ST_I2CHS1_SHIFT                       19
+#define OMAP2430_ST_I2CHS1_MASK                                (1 << 19)
 #define OMAP2420_ST_I2C1_SHIFT                         19
 #define OMAP2420_ST_I2C1_MASK                          (1 << 19)
+#define OMAP2430_ST_I2CHS2_SHIFT                       20
+#define OMAP2430_ST_I2CHS2_MASK                                (1 << 20)
 #define OMAP24XX_ST_MCBSP2_SHIFT                       16
 #define OMAP24XX_ST_MCBSP2_MASK                                (1 << 16)
 #define OMAP24XX_ST_MCBSP1_SHIFT                       15
@@ -432,4 +434,9 @@
 #define OMAP2430_AUTOSTATE_MDM_SHIFT                   0
 #define OMAP2430_AUTOSTATE_MDM_MASK                    (1 << 0)
 
+/* OMAP24XX CM_CLKSTCTRL_*.AUTOSTATE_* register bit values */
+#define OMAP24XX_CLKSTCTRL_DISABLE_AUTO                0x0
+#define OMAP24XX_CLKSTCTRL_ENABLE_AUTO         0x1
+
+
 #endif