From 5f4683cf3641397557ee12b9694151a91c23ebe2 Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath Date: Wed, 4 Jul 2012 03:41:03 -0600 Subject: [PATCH] --- yaml --- r: 313383 b: refs/heads/master c: 768c69f5e9227a855a7bbb490b18628133fa891a h: refs/heads/master i: 313381: e5f507fb021c62fcb296f944a89224b6c748d401 313379: 8ed126ea1df1447de0816c246c27fc8b4f830c7c 313375: 7d8f2d2981feb9626409469996cb2754775c4dfa v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 37bd0af7a994..359f321da0fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 248b3b3d841b01d0a5a55b746fc7e5e9edbe65e6 +refs/heads/master: 768c69f5e9227a855a7bbb490b18628133fa891a diff --git a/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h b/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h index 2c1710386963..7cb8d7dddcc5 100644 --- a/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -384,11 +384,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 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;