OMAP: CM: Move MAX_MODULE_READY_TIME to cm.h (d9e6625c) · Commits · 戴 / test

arch/arm/mach-omap2/cm.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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
		};

+9 −0

Original line number	Diff line number	Diff line
		@@ -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

+1 −17

Original line number	Diff line number	Diff line
		@@ -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