[PATCH 04/14] ARM: OMAP5: CM: Add OMAP54XX register and bitfield files

[Paul Walmsley]

On Wed, 29 May 2013, Santosh Shilimkar wrote:

> From: Benoit Cousson <b-cousson at ti.com>
> 
> Add the new defines for OMAP54XX cm registers.
> 
> Cc: Paul Walmsley <paul at pwsan.com>
> 
> Signed-off-by: Rajendra Nayak <rnayak at ti.com>
> Signed-off-by: Benoit Cousson <b-cousson at ti.com>
> [santosh.shilimkar at ti.com: Generated es2.0 data]
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar at ti.com>

...

> diff --git a/arch/arm/mach-omap2/cm1_54xx.h b/arch/arm/mach-omap2/cm1_54xx.h
> new file mode 100644
> index 0000000..7b1f3b6
> --- /dev/null
> +++ b/arch/arm/mach-omap2/cm1_54xx.h

...

> +
> +/* Function prototypes */
> +extern u32 omap4_cm1_read_inst_reg(s16 inst, u16 idx);
> +extern void omap4_cm1_write_inst_reg(u32 val, s16 inst, u16 idx);
> +extern u32 omap4_cm1_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx);

No need for these since they're already prototyped in a common
file in your earlier patch set.

> diff --git a/arch/arm/mach-omap2/cm2_54xx.h b/arch/arm/mach-omap2/cm2_54xx.h
> new file mode 100644
> index 0000000..bab76bd
> --- /dev/null
> +++ b/arch/arm/mach-omap2/cm2_54xx.h
> @@ -0,0 +1,394 @@

...

> +/* Function prototypes */
> +extern u32 omap4_cm2_read_inst_reg(s16 inst, u16 idx);
> +extern void omap4_cm2_write_inst_reg(u32 val, s16 inst, u16 idx);
> +extern u32 omap4_cm2_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx);

No need for these since they're already prototyped in a common
file in your earlier patch set.

Fixed in the local copy here.


- Paul