diff options
| author | Paul Walmsley <paul@pwsan.com> | 2011-03-11 05:43:05 (GMT) |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2011-03-11 05:43:05 (GMT) |
| commit | 2d403fe03070b541cc93cfa915f6e6c592cf231c (patch) | |
| tree | 530e0bf3a99a9aa93e0113a916fb7a547605ad2e /arch/arm/plat-omap/include | |
| parent | 21ace5452ce3327f0d11f85b0c33dfcd0d20fdb2 (diff) | |
| parent | cc1226e7635011c7dd1e786770ed51ee751800f2 (diff) | |
| download | linux-fsl-qoriq-2d403fe03070b541cc93cfa915f6e6c592cf231c.tar.xz | |
Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.39-20110310-024
Conflicts:
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/plat-omap/include/plat/omap_hwmod.h
Diffstat (limited to 'arch/arm/plat-omap/include')
| -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 8a1368f..fca0cbc 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 { * struct omap_hwmod_rst_info - IPs reset lines use by hwmod * @name: name of the reset line (module local name) * @rst_shift: Offset of the reset bit + * @st_shift: Offset of the reset status bit (OMAP2/3 only) * * @name should be something short, e.g., "cpu0" or "rst". It is defined * locally to the hwmod. @@ -132,6 +133,7 @@ struct omap_hwmod_dma_info { struct omap_hwmod_rst_info { const char *name; u8 rst_shift; + u8 st_shift; }; /** @@ -377,7 +379,7 @@ struct omap_hwmod_omap4_prcm { * HWMOD_INIT_NO_IDLE: don't idle this module at boot - important for SDRAM * controller, etc. XXX probably belongs outside the main hwmod file * XXX Should be HWMOD_SETUP_NO_IDLE - * HWMOD_NO_AUTOIDLE: disable module autoidle (OCP_SYSCONFIG.AUTOIDLE) + * HWMOD_NO_OCP_AUTOIDLE: disable module autoidle (OCP_SYSCONFIG.AUTOIDLE) * when module is enabled, rather than the default, which is to * enable autoidle * HWMOD_SET_DEFAULT_CLOCKACT: program CLOCKACTIVITY bits at startup |