ARM: OMAP2+: hwmod: extend OCP_* register offsets from 16 to 32 bits

Extend the OCP_* register offsets in the struct
omap_hwmod_class_sysconfig to 32 bits.  This is required to add the
OMAP4+ GPU hwmod, which uses OCP_* register offsets larger than 16
bits.

Another possible solution may be to simply add a single 16 bit offset
field in this structure, and to add code to factor that offset into
all OCP_* register accesses.  This would save some memory, since
almost no modules need 32 bit offsets.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Benoît Cousson <b-cousson@ti.com>

diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h
index 92752b8a6fbb871944c62fd502ff594fbc6b7dce..65285317f80b9ecdae07bc8aa5c2dcf9a9419e11 100644 (file)
--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -328,9 +328,9 @@ struct omap_hwmod_sysc_fields {
  * then this field has to be populated with the correct offset structure.
  */
 struct omap_hwmod_class_sysconfig {
-       u16 rev_offs;
-       u16 sysc_offs;
-       u16 syss_offs;
+       u32 rev_offs;
+       u32 sysc_offs;
+       u32 syss_offs;
        u16 sysc_flags;
        struct omap_hwmod_sysc_fields *sysc_fields;
        u8 srst_udelay;