diff options
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap_hwmod.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hwmod.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 8a1368fbbbd3..fca0cbce4659 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h | |||
@@ -125,6 +125,7 @@ struct omap_hwmod_dma_info { | |||
125 | * struct omap_hwmod_rst_info - IPs reset lines use by hwmod | 125 | * struct omap_hwmod_rst_info - IPs reset lines use by hwmod |
126 | * @name: name of the reset line (module local name) | 126 | * @name: name of the reset line (module local name) |
127 | * @rst_shift: Offset of the reset bit | 127 | * @rst_shift: Offset of the reset bit |
128 | * @st_shift: Offset of the reset status bit (OMAP2/3 only) | ||
128 | * | 129 | * |
129 | * @name should be something short, e.g., "cpu0" or "rst". It is defined | 130 | * @name should be something short, e.g., "cpu0" or "rst". It is defined |
130 | * locally to the hwmod. | 131 | * locally to the hwmod. |
@@ -132,6 +133,7 @@ struct omap_hwmod_dma_info { | |||
132 | struct omap_hwmod_rst_info { | 133 | struct omap_hwmod_rst_info { |
133 | const char *name; | 134 | const char *name; |
134 | u8 rst_shift; | 135 | u8 rst_shift; |
136 | u8 st_shift; | ||
135 | }; | 137 | }; |
136 | 138 | ||
137 | /** | 139 | /** |
@@ -377,7 +379,7 @@ struct omap_hwmod_omap4_prcm { | |||
377 | * HWMOD_INIT_NO_IDLE: don't idle this module at boot - important for SDRAM | 379 | * HWMOD_INIT_NO_IDLE: don't idle this module at boot - important for SDRAM |
378 | * controller, etc. XXX probably belongs outside the main hwmod file | 380 | * controller, etc. XXX probably belongs outside the main hwmod file |
379 | * XXX Should be HWMOD_SETUP_NO_IDLE | 381 | * XXX Should be HWMOD_SETUP_NO_IDLE |
380 | * HWMOD_NO_AUTOIDLE: disable module autoidle (OCP_SYSCONFIG.AUTOIDLE) | 382 | * HWMOD_NO_OCP_AUTOIDLE: disable module autoidle (OCP_SYSCONFIG.AUTOIDLE) |
381 | * when module is enabled, rather than the default, which is to | 383 | * when module is enabled, rather than the default, which is to |
382 | * enable autoidle | 384 | * enable autoidle |
383 | * HWMOD_SET_DEFAULT_CLOCKACT: program CLOCKACTIVITY bits at startup | 385 | * HWMOD_SET_DEFAULT_CLOCKACT: program CLOCKACTIVITY bits at startup |