aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2012-07-04 07:09:21 -0400
committerPaul Walmsley <paul@pwsan.com>2012-07-04 07:09:21 -0400
commit6668546f3bb4cc0dde75ac1ef1d436b67e4ef638 (patch)
treedc14b9f2dcfdd095fcd3ba632c8e4ab81f179c93 /arch/arm/plat-omap
parent3f4990f44a5dcf15a053a041c813fa73ffa75608 (diff)
ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework
The DMADISABLE bit is a semi-automatic bit present in sysconfig register of some modules. When the DMA must perform read/write accesses, the DMADISABLE bit is cleared by the hardware. But when the DMA must stop for power management, software must set the DMADISABLE bit back to 1. In cases where the ROMCODE/BOOTLOADER uses dma, the hardware clears the DMADISABLE bit (but the romcode/bootloader might not set it back to 1). In order for the kernel to start in a clean state, it is necessary for the kernel to set DMADISABLE bit back to 1 (irrespective of whether it's been set to 1 in romcode or bootloader). During _reset of the (hwmod)device, the DMADISABLE bit is set so that it does not prevent idling of the system. (NOTE: having DMADISABLE to 0, prevents the system to idle) DMADISABLE bit is present in usbotgss module of omap5. Cc: Benoit Cousson <b-cousson@ti.com> Cc: Kevin Hilman <khilman@ti.com> Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> [paul@pwsan.com: updated to apply; fixed checkpatch warnings] Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/plat/omap_hwmod.h5
1 files changed, 5 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 da22acd0ce7a..27455ed0a2ab 100644
--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -69,6 +69,8 @@ extern struct omap_hwmod_sysc_fields omap_hwmod_sysc_type2;
69#define SYSC_TYPE2_SIDLEMODE_MASK (0x3 << SYSC_TYPE2_SIDLEMODE_SHIFT) 69#define SYSC_TYPE2_SIDLEMODE_MASK (0x3 << SYSC_TYPE2_SIDLEMODE_SHIFT)
70#define SYSC_TYPE2_MIDLEMODE_SHIFT 4 70#define SYSC_TYPE2_MIDLEMODE_SHIFT 4
71#define SYSC_TYPE2_MIDLEMODE_MASK (0x3 << SYSC_TYPE2_MIDLEMODE_SHIFT) 71#define SYSC_TYPE2_MIDLEMODE_MASK (0x3 << SYSC_TYPE2_MIDLEMODE_SHIFT)
72#define SYSC_TYPE2_DMADISABLE_SHIFT 16
73#define SYSC_TYPE2_DMADISABLE_MASK (0x1 << SYSC_TYPE2_DMADISABLE_SHIFT)
72 74
73/* OCP SYSSTATUS bit shifts/masks */ 75/* OCP SYSSTATUS bit shifts/masks */
74#define SYSS_RESETDONE_SHIFT 0 76#define SYSS_RESETDONE_SHIFT 0
@@ -283,6 +285,7 @@ struct omap_hwmod_ocp_if {
283#define SYSS_HAS_RESET_STATUS (1 << 7) 285#define SYSS_HAS_RESET_STATUS (1 << 7)
284#define SYSC_NO_CACHE (1 << 8) /* XXX SW flag, belongs elsewhere */ 286#define SYSC_NO_CACHE (1 << 8) /* XXX SW flag, belongs elsewhere */
285#define SYSC_HAS_RESET_STATUS (1 << 9) 287#define SYSC_HAS_RESET_STATUS (1 << 9)
288#define SYSC_HAS_DMADISABLE (1 << 10)
286 289
287/* omap_hwmod_sysconfig.clockact flags */ 290/* omap_hwmod_sysconfig.clockact flags */
288#define CLOCKACT_TEST_BOTH 0x0 291#define CLOCKACT_TEST_BOTH 0x0
@@ -298,6 +301,7 @@ struct omap_hwmod_ocp_if {
298 * @enwkup_shift: Offset of the enawakeup bit 301 * @enwkup_shift: Offset of the enawakeup bit
299 * @srst_shift: Offset of the softreset bit 302 * @srst_shift: Offset of the softreset bit
300 * @autoidle_shift: Offset of the autoidle bit 303 * @autoidle_shift: Offset of the autoidle bit
304 * @dmadisable_shift: Offset of the dmadisable bit
301 */ 305 */
302struct omap_hwmod_sysc_fields { 306struct omap_hwmod_sysc_fields {
303 u8 midle_shift; 307 u8 midle_shift;
@@ -306,6 +310,7 @@ struct omap_hwmod_sysc_fields {
306 u8 enwkup_shift; 310 u8 enwkup_shift;
307 u8 srst_shift; 311 u8 srst_shift;
308 u8 autoidle_shift; 312 u8 autoidle_shift;
313 u8 dmadisable_shift;
309}; 314};
310 315
311/** 316/**