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

[cascardo/linux.git] / arch / arm / mach-omap2 / scrm44xx.h

diff --git a/arch/arm/mach-omap2/scrm44xx.h b/arch/arm/mach-omap2/scrm44xx.h
index 701bf2d..e897ac8 100644 (file)
--- a/arch/arm/mach-omap2/scrm44xx.h
+++ b/arch/arm/mach-omap2/scrm44xx.h
@@ -127,12 +127,14 @@
 /* AUXCLKREQ0 */
 #define OMAP4_MAPPING_SHIFT                    2
 #define OMAP4_MAPPING_MASK                     (0x7 << 2)
+#define OMAP4_MAPPING_WIDTH                    3
 #define OMAP4_ACCURACY_SHIFT                   1
 #define OMAP4_ACCURACY_MASK                    (1 << 1)
 
 /* AUXCLK0 */
 #define OMAP4_CLKDIV_SHIFT                     16
 #define OMAP4_CLKDIV_MASK                      (0xf << 16)
+#define OMAP4_CLKDIV_WIDTH                     4
 #define OMAP4_DISABLECLK_SHIFT                 9
 #define OMAP4_DISABLECLK_MASK                  (1 << 9)
 #define OMAP4_ENABLE_SHIFT                     8