---

yaml --- r: 313383 b: refs/heads/master c: 768c69f h: refs/heads/master i: 313381: e5f507f 313379: 8ed126e 313375: 7d8f2d2 v: v3
git-mirror · Jul 4, 2012 · 5f4683c · 5f4683c
1 parent 47307b6
commit 5f4683c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;