On Fri, Mar 30, 2012 at 21:33:53, Hiremath, Vaibhav wrote: > In case of AM33XX device, XXX_RSTST register offset is not > consistent across PRM modules/instances, > > PRM_XXX RSTST > ========================= > PRM_PER_MOD: 0x04 > PRM_WKUP_MOD: 0x0C > PRM_MPU_MOD: NA > PRM_DEVICE_MOD: 0x08 > > This means, we need to pass on XXX_RSTST register offset > information through omap_hwmod data, similar to XXX_RSTCTRL. > > Currently, this field is only applicable and used for AM33XX > devices. > > Signed-off-by: Vaibhav Hiremath <hvaibhav@xxxxxx> > Cc: Benoit Cousson <b-cousson@xxxxxx> > Cc: Tony Lindgren <tony@xxxxxxxxxxx> > Cc: Kevin Hilman <khilman@xxxxxx> > Cc: Paul Walmsley <paul@xxxxxxxxx> > Cc: Rajendra Nayak <rnayak@xxxxxx> > --- > arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h > index 9ae87eb..50f42ec 100644 > --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h > +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h > @@ -374,11 +374,13 @@ struct omap_hwmod_omap2_prcm { > * struct omap_hwmod_omap4_prcm - OMAP4-specific PRCM data > * @clkctrl_reg: PRCM address of the clock control register > * @rstctrl_reg: address of the XXX_RSTCTRL register located in the PRM > + * @rstst_reg: (AM33XX Only) address of the XXX_RSTST register located in the PRM > * @submodule_wkdep_bit: bit shift of the WKDEP range > */ > struct omap_hwmod_omap4_prcm { > u16 clkctrl_offs; > u16 rstctrl_offs; > + u16 rstst_offs; > u16 context_offs; > u8 submodule_wkdep_bit; > u8 modulemode; Paul, We have missed this patch from the series, can you merge this one as well? Thanks, Vaibhav -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html