summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorTony Lindgren2012-04-20 02:45:33 +0200
committerTony Lindgren2012-04-20 02:45:33 +0200
commit1df82cd6d7673006ae2ecbe8745bcf44f61c53a8 (patch)
tree737dbba397924c3b566878012ab6fef7fa7dfafe /arch/arm/plat-omap
parentMerge tag 'omap-cleanup-b-for-3.5' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentARM: OMAP4: hwmod data: add DEBUGSS skeleton (diff)
downloadkernel-qcow2-linux-1df82cd6d7673006ae2ecbe8745bcf44f61c53a8.tar.gz
kernel-qcow2-linux-1df82cd6d7673006ae2ecbe8745bcf44f61c53a8.tar.xz
kernel-qcow2-linux-1df82cd6d7673006ae2ecbe8745bcf44f61c53a8.zip
Merge tag 'omap-devel-a-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod
Add in most of the remaining hwmods (IP block descriptions) for the OMAP44xx family of SoCs. There still seem to be a few missing, such as those for the MMU IP blocks, but this seems to cover the bulk of the remainder.
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/plat/omap_hwmod.h1
1 files changed, 1 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 14dde32cd406..c835b7194ff5 100644
--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -214,6 +214,7 @@ struct omap_hwmod_addr_space {
#define OCP_USER_MPU (1 << 0)
#define OCP_USER_SDMA (1 << 1)
#define OCP_USER_DSP (1 << 2)
+#define OCP_USER_IVA (1 << 3)
/* omap_hwmod_ocp_if.flags bits */
#define OCPIF_SWSUP_IDLE (1 << 0)