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

[mv-sheeva.git] / arch / arm / plat-omap / include / plat / clkdev_omap.h

diff --git a/arch/arm/plat-omap/include/plat/clkdev_omap.h b/arch/arm/plat-omap/include/plat/clkdev_omap.h
index bb937f3fabed3b9f88b9cb98df6109748d3d312b..256ab3f1ec8fabc111842a02208211da49fa813f 100644 (file)
--- a/arch/arm/plat-omap/include/plat/clkdev_omap.h
+++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h
@@ -8,7 +8,7 @@
 #ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_PLAT_CLKDEV_OMAP_H
 #define __ARCH_ARM_PLAT_OMAP_INCLUDE_PLAT_CLKDEV_OMAP_H
 
-#include <asm/clkdev.h>
+#include <linux/clkdev.h>
 
 struct omap_clk {
        u16                             cpu;
@@ -31,18 +31,18 @@ struct omap_clk {
 #define CK_1510                (1 << 2)
 #define CK_16XX                (1 << 3)        /* 16xx, 17xx, 5912 */
 #define CK_242X                (1 << 4)
-#define CK_243X                (1 << 5)
-#define CK_3XXX                (1 << 6)        /* OMAP3 + AM3 common clocks*/
-#define CK_343X                (1 << 7)        /* OMAP34xx common clocks */
-#define CK_3430ES1     (1 << 8)        /* 34xxES1 only */
-#define CK_3430ES2     (1 << 9)        /* 34xxES2, ES3, non-Sitara 35xx only */
-#define CK_3505                (1 << 10)
-#define CK_3517                (1 << 11)
-#define CK_36XX                (1 << 12)       /* OMAP36xx/37xx-specific clocks */
-#define CK_443X                (1 << 13)
+#define CK_243X                (1 << 5)        /* 243x, 253x */
+#define CK_3430ES1     (1 << 6)        /* 34xxES1 only */
+#define CK_3430ES2PLUS (1 << 7)        /* 34xxES2, ES3, non-Sitara 35xx only */
+#define CK_3505                (1 << 8)
+#define CK_3517                (1 << 9)
+#define CK_36XX                (1 << 10)       /* 36xx/37xx-specific clocks */
+#define CK_443X                (1 << 11)
 
-#define CK_AM35XX      (CK_3505 | CK_3517)     /* all Sitara AM35xx */
 
+#define CK_34XX                (CK_3430ES1 | CK_3430ES2PLUS)
+#define CK_AM35XX      (CK_3505 | CK_3517)     /* all Sitara AM35xx */
+#define CK_3XXX                (CK_34XX | CK_AM35XX | CK_36XX)
 
 
 #endif