diff options
author | Tony Lindgren <tony@atomide.com> | 2015-07-23 21:59:18 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-07-23 21:59:18 -0700 |
commit | 24da741c678f865de3182194604dbddcc7fc7f3c (patch) | |
tree | 0322f37f8e9e4e945acc100a0d1821db268fe624 /arch/arm/mach-omap2/prcm-common.h | |
parent | 97d9a3d0967f711e271ef950f1745307720c95d5 (diff) | |
parent | 0f3ccb24c0347cd80160810df79bfa233749074e (diff) | |
download | linux-stable-24da741c678f865de3182194604dbddcc7fc7f3c.tar.gz linux-stable-24da741c678f865de3182194604dbddcc7fc7f3c.tar.bz2 linux-stable-24da741c678f865de3182194604dbddcc7fc7f3c.zip |
Merge branch 'dm814x-soc' into omap-for-v4.3/soc
Update dm814x changes for sparse fixes to make data structures
static.
Conflicts:
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
Diffstat (limited to 'arch/arm/mach-omap2/prcm-common.h')
-rw-r--r-- | arch/arm/mach-omap2/prcm-common.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h index af0cee0881de..c8f590b7c32d 100644 --- a/arch/arm/mach-omap2/prcm-common.h +++ b/arch/arm/mach-omap2/prcm-common.h @@ -51,6 +51,12 @@ /* * TI81XX PRM module offsets */ +#define TI814X_PRM_DSP_MOD 0x0a00 +#define TI814X_PRM_HDVICP_MOD 0x0c00 +#define TI814X_PRM_ISP_MOD 0x0d00 +#define TI814X_PRM_HDVPSS_MOD 0x0e00 +#define TI814X_PRM_GFX_MOD 0x0f00 + #define TI81XX_PRM_DEVICE_MOD 0x0000 #define TI816X_PRM_ACTIVE_MOD 0x0a00 #define TI81XX_PRM_DEFAULT_MOD 0x0b00 |