From: Paul Walmsley Date: Thu, 19 Apr 2012 10:03:57 +0000 (-0600) Subject: ARM: OMAP2+: hwmod: extend OCP_* register offsets from 16 to 32 bits X-Git-Tag: v3.5-rc1~156^2~12^2^2~12 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=515237d6fef36ebc476a4ce9204a3234ac14cf45;p=karo-tx-linux.git 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 Cc: Benoît Cousson --- diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 92752b8a6fbb..65285317f80b 100644 --- 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;