Subject: [PATCH] Revert "ARM: AM33xx: fix module_wait_ready without clkctrl register"

From: [email-masked] (Lokesh Vutla)
Date: Tue, 12 Jul 2016 09:04:20 +0530

On Tuesday 12 July 2016 03:09 AM, Dave Gerlach wrote:
> This reverts commit 183e2077d007aa4b697efba095ecfea7244a6107.
> 
> The original patch added a check to am33xx_cm_wait_module_ready for a
> clkctrl offset of 0 as an invalid case, however, clkctrl offset of 0 is
> perfectly valid for hwmods, in particular the rtc.

Looks like a similar check is present for am33xx_cm_wait_module_idle.
Shouldn't that also be removed?

Thanks and regards,
Lokesh

> 
> Without reverting this patch sometimes external aborts are seen on
> am335x during boot. This is due to the am33xx_cm_wait_module_ready
> function immediately returning 0 rather than waiting for the RTC_CLKCTRL
> register to indicate it is actually ready before rtc register accesses
> happen.
> 
> Signed-off-by: Dave Gerlach <[email-masked]>
> ---
>  arch/arm/mach-omap2/cm33xx.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/cm33xx.c b/arch/arm/mach-omap2/cm33xx.c
> index c073fb57dd13..7b181f929525 100644
> --- a/arch/arm/mach-omap2/cm33xx.c
> +++ b/arch/arm/mach-omap2/cm33xx.c
> @@ -220,9 +220,6 @@ static int am33xx_cm_wait_module_ready(u8 part, s16 inst, u16 clkctrl_offs,
>  {
>  	int i = 0;
>  
> -	if (!clkctrl_offs)
> -		return 0;
> -
>  	omap_test_timeout(_is_module_ready(inst, clkctrl_offs),
>  			  MAX_MODULE_READY_TIME, i);
>  
>