Re: [PATCH] ARM: omap4: prm: Fix up swapped offset macros

["Cousson, Benoit" <b-cousson@ti.com>]

Hi Rajendra,

On 11/7/2011 11:06 AM, Rajendra Nayak wrote:
> The offset macros for OMAP4_RM_RSTST and OMAP4_RM_RSTTIME
> are wrongly swapped up.
> 
> Thanks to Gina Glaser for identifying and reporting this.
> 
> Signed-off-by: Rajendra Nayak<rnayak@ti.com>
> Cc: Gina Glaser<g-glaser@ti.com>
> ---
>   arch/arm/mach-omap2/prm44xx.h |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h
> index 3d66ccd..aa8593e 100644
> --- a/arch/arm/mach-omap2/prm44xx.h
> +++ b/arch/arm/mach-omap2/prm44xx.h
> @@ -62,8 +62,8 @@
> 
>   /* OMAP4 specific register offsets */
>   #define OMAP4_RM_RSTCTRL				0x0000
> -#define OMAP4_RM_RSTTIME				0x0004
> -#define OMAP4_RM_RSTST				0x0008
> +#define OMAP4_RM_RSTST				0x0004
> +#define OMAP4_RM_RSTTIME				0x0008
>   #define OMAP4_PM_PWSTCTRL				0x0000
>   #define OMAP4_PM_PWSTST				0x0004

In fact these defines were already defined correctly later (with a slightly different name):

/* PRM.DEVICE_PRM register offsets */

[...]

#define OMAP4_PRM_RSTST_OFFSET		0x0004
#define OMAP4430_PRM_RSTST		OMAP44XX_PRM_REGADDR(OMAP4430_PRM_DEVICE_INST, 0x0004)
#define OMAP4_PRM_RSTTIME_OFFSET	0x0008
#define OMAP4430_PRM_RSTTIME		OMAP44XX_PRM_REGADDR(OMAP4430_PRM_DEVICE_INST, 0x0008)


I don't know where these defines are used, but we'd better use the existing ones.

Benoit