From 7cddfacd4525c0f435c3e3cecfb7e7c2701b3a3b Mon Sep 17 00:00:00 2001
From: Benoit Cousson <b-cousson@ti.com>
Date: Thu, 20 May 2010 12:31:08 -0600
Subject: [PATCH] --- yaml --- r: 196207 b: refs/heads/master c:
 d9e6625c70ff007ae246c9d62f8cdec8d08b2457 h: refs/heads/master i:   196205:
 bb5adc1162b707876681fca6ad9bbf19f69018ee   196203:
 b4545025b4d195ce6fa4eb3c8540493428104cb8   196199:
 9d01243dc4b891f1d9d14bcf1fcd7e6d73e2ae31   196191:
 a64c69962d73ccdd19f51f8ac28cf495eea3cdff v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm/mach-omap2/cm.c     |  3 ---
 trunk/arch/arm/mach-omap2/cm.h     |  9 +++++++++
 trunk/arch/arm/mach-omap2/cm4xxx.c | 18 +-----------------
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 977ece89b6d2..8392098fbac8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53934aa74d49daa7c31c38028fd05c99475489d6
+refs/heads/master: d9e6625c70ff007ae246c9d62f8cdec8d08b2457
diff --git a/trunk/arch/arm/mach-omap2/cm.c b/trunk/arch/arm/mach-omap2/cm.c
index 58e4a1c557d8..2d83565d2be2 100644
--- a/trunk/arch/arm/mach-omap2/cm.c
+++ b/trunk/arch/arm/mach-omap2/cm.c
@@ -27,9 +27,6 @@
 #include "cm-regbits-24xx.h"
 #include "cm-regbits-34xx.h"
 
-/* MAX_MODULE_READY_TIME: max milliseconds for module to leave idle */
-#define MAX_MODULE_READY_TIME		20000
-
 static const u8 cm_idlest_offs[] = {
 	CM_IDLEST1, CM_IDLEST2, OMAP2430_CM_IDLEST3
 };
diff --git a/trunk/arch/arm/mach-omap2/cm.h b/trunk/arch/arm/mach-omap2/cm.h
index b6ab183212df..bbc69df3bf3d 100644
--- a/trunk/arch/arm/mach-omap2/cm.h
+++ b/trunk/arch/arm/mach-omap2/cm.h
@@ -144,4 +144,13 @@ static inline u32 cm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)
 #define OMAP24XX_CM_IDLEST_VAL		0
 #define OMAP34XX_CM_IDLEST_VAL		1
 
+/*
+ * MAX_MODULE_READY_TIME: max duration in microseconds to wait for the
+ * PRCM to request that a module exit the inactive state in the case of
+ * OMAP2 & 3.
+ * In the case of OMAP4 this is the max duration in microseconds for the
+ * module to reach the functionnal state from an inactive state.
+ */
+#define MAX_MODULE_READY_TIME		2000
+
 #endif
diff --git a/trunk/arch/arm/mach-omap2/cm4xxx.c b/trunk/arch/arm/mach-omap2/cm4xxx.c
index 4af76bb1003a..af32a457a46b 100644
--- a/trunk/arch/arm/mach-omap2/cm4xxx.c
+++ b/trunk/arch/arm/mach-omap2/cm4xxx.c
@@ -22,23 +22,7 @@
 #include <asm/atomic.h>
 
 #include "cm.h"
-
-/* XXX move this to cm.h */
-/* MAX_MODULE_READY_TIME: max milliseconds for module to leave idle */
-#define MAX_MODULE_READY_TIME			20000
-
-/*
- * OMAP4_PRCM_CM_CLKCTRL_IDLEST_MASK: isolates the IDLEST field in the
- * CM_CLKCTRL register.
- */
-#define OMAP4_PRCM_CM_CLKCTRL_IDLEST_MASK	(0x2 << 16)
-
-/*
- * OMAP4 prcm_mod u32 fields contain packed data: the CM ID in bit 16 and
- * the PRCM module offset address (from the CM module base) in bits 15-0.
- */
-#define OMAP4_PRCM_MOD_CM_ID_SHIFT		16
-#define OMAP4_PRCM_MOD_OFFS_MASK		0xffff
+#include "cm-regbits-44xx.h"
 
 /**
  * omap4_cm_wait_idlest_ready - wait for a module to leave idle or standby