[PATCH v3 03/13] OMAP4: hwmod: Replace CLKCTRL absolute address with offset macros

[Todd Poynor]

On Thu, Jul 07, 2011 at 02:25:23AM -0600, Paul Walmsley wrote:
> On Fri, 1 Jul 2011, Benoit Cousson wrote:
> 
> > The CLKCTRL register was accessed using an absolute address.
> > The usage of hardcoded macros to calculate virtual address from physical
> > one should be avoided as much as possible.
> > The usage of a offset will allow future improvement like migration from
> > the current architecture code toward a module driver.
> > 
> > Update cm_xxx accessor, move definition to the proper header file and
> > update copyrights.
> > 
> > Signed-off-by: Benoit Cousson <b-cousson at ti.com>
> > Cc: Paul Walmsley <paul at pwsan.com>
> > Cc: Rajendra Nayak <rnayak at ti.com>
> 
> This patch was updated to use '_cminst_' in the function names that are in 
> the cminst44xx.c file, rather than '_cm_', to preserve consistency with 
> the rest of the file.  Updated patch below.
> 
...
> -int omap4_cm_wait_module_ready(void __iomem *clkctrl_reg)
> +int omap4_cminst_wait_module_ready(u8 part, u16 inst, s16 cdoffs, u16 clkctrl_offs)
>  {
>  	int i = 0;
>  
> -	if (!clkctrl_reg)
> +	if (!clkctrl_offs)
>  		return 0;
>  
>  	omap_test_timeout((
> -		((__raw_readl(clkctrl_reg) & OMAP4430_IDLEST_MASK) == 0) ||
> -		 (((__raw_readl(clkctrl_reg) & OMAP4430_IDLEST_MASK) >>
> -		  OMAP4430_IDLEST_SHIFT) == 0x2)),
> +		_clkctrl_idlest(part, inst, cdoffs, clkctrl_offs) == 0 ||
> +		_clkctrl_idlest(part, inst, cdoffs, clkctrl_offs) == 0x2),
>  		MAX_MODULE_READY_TIME, i);

Suggest adding symbols for the constant IDLEST values, next to the 0x3
value added for "[PATCH v2 04/13] OMAP: hwmod: Wait the idle status to
be disabled".

Would be nice to call _clkctrl_idlest() once.

Similar vague questioning of the API names as for the above-mentioned
patch: this waits for the module slave to be ready, don't know if
anything similar is needed for module masters or if it's important to
keep this distinction.


Todd