2 files changed, 18 insertions, 13 deletions

diff --git a/arch/arm/plat-omap/include/plat/clkdev_omap.h b/arch/arm/plat-omap/include/plat/clkdev_omap.h
index bb937f3fabed..b19774c9c112 100644
--- a/arch/arm/plat-omap/include/plat/clkdev_omap.h
+++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h
@@ -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
diff --git a/arch/arm/plat-omap/include/plat/clock.h b/arch/arm/plat-omap/include/plat/clock.h
index fef4696dcf67..6e223158268b 100644
--- a/arch/arm/plat-omap/include/plat/clock.h
+++ b/arch/arm/plat-omap/include/plat/clock.h
@@ -49,13 +49,18 @@ struct clkops {
 /* struct clksel_rate.flags possibilities */
 #define RATE_IN_242X            (1 << 0)
 #define RATE_IN_243X            (1 << 1)
-#define RATE_IN_3XXX            (1 << 2)        /* rates common to all OMAP3 */
-#define RATE_IN_3430ES2         (1 << 3)        /* 3430ES2 rates only */
+#define RATE_IN_3430ES1         (1 << 2)        /* 3430ES1 rates only */
+#define RATE_IN_3430ES2PLUS     (1 << 3)        /* 3430 ES >= 2 rates only */
 #define RATE_IN_36XX            (1 << 4)
 #define RATE_IN_4430            (1 << 5)
 
 #define RATE_IN_24XX            (RATE_IN_242X | RATE_IN_243X)
-#define RATE_IN_3430ES2PLUS     (RATE_IN_3430ES2 | RATE_IN_36XX)
+#define RATE_IN_34XX            (RATE_IN_3430ES1 | RATE_IN_3430ES2PLUS)
+#define RATE_IN_3XXX            (RATE_IN_34XX | RATE_IN_36XX)
+
+/* RATE_IN_3430ES2PLUS_36XX includes 34xx/35xx with ES >=2, and all 36xx/37xx */
+#define RATE_IN_3430ES2PLUS_36XX        (RATE_IN_3430ES2PLUS | RATE_IN_36XX)
+
 
 /**
  * struct clksel_rate - register bitfield values corresponding to clk divisors