From: Benoit Cousson Date: Thu, 20 May 2010 18:31:08 +0000 (-0600) Subject: OMAP: CM: Move MAX_MODULE_READY_TIME to cm.h X-Git-Tag: v2.6.35-rc1~456^2~1^2~20 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e6625c70ff007ae246c9d62f8cdec8d08b2457;p=pandora-kernel.git OMAP: CM: Move MAX_MODULE_READY_TIME to cm.h The maximum timeout to wait for the PRCM to request that a module exit idle or reach functionnal state is common to OMAP2/3/4 SoCs, so, move it to the chip family-common cm.h include file. Reduce the timeout from 20 ms to 2 ms. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley --- diff --git a/arch/arm/mach-omap2/cm.c b/arch/arm/mach-omap2/cm.c index 58e4a1c557d8..2d83565d2be2 100644 --- a/arch/arm/mach-omap2/cm.c +++ b/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 }; Reading git-diff-tree failed