diff options
Diffstat (limited to 'arch/arm/mach-omap2/prm-regbits-34xx.h')
-rw-r--r-- | arch/arm/mach-omap2/prm-regbits-34xx.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h index b4686bc345ca..5b5ecfe6c999 100644 --- a/arch/arm/mach-omap2/prm-regbits-34xx.h +++ b/arch/arm/mach-omap2/prm-regbits-34xx.h | |||
@@ -68,7 +68,8 @@ | |||
68 | #define OMAP3430_VPINIDLE (1 << 0) | 68 | #define OMAP3430_VPINIDLE (1 << 0) |
69 | 69 | ||
70 | /* PM_WKDEP_IVA2, PM_WKDEP_MPU shared bits */ | 70 | /* PM_WKDEP_IVA2, PM_WKDEP_MPU shared bits */ |
71 | #define OMAP3430_EN_PER (1 << 7) | 71 | #define OMAP3430_EN_PER_SHIFT 7 |
72 | #define OMAP3430_EN_PER_MASK (1 << 7) | ||
72 | 73 | ||
73 | /* PM_PWSTCTRL_IVA2, PM_PWSTCTRL_MPU, PM_PWSTCTRL_CORE shared bits */ | 74 | /* PM_PWSTCTRL_IVA2, PM_PWSTCTRL_MPU, PM_PWSTCTRL_CORE shared bits */ |
74 | #define OMAP3430_MEMORYCHANGE (1 << 3) | 75 | #define OMAP3430_MEMORYCHANGE (1 << 3) |
@@ -77,7 +78,7 @@ | |||
77 | #define OMAP3430_LOGICSTATEST (1 << 2) | 78 | #define OMAP3430_LOGICSTATEST (1 << 2) |
78 | 79 | ||
79 | /* PM_PREPWSTST_IVA2, PM_PREPWSTST_CORE shared bits */ | 80 | /* PM_PREPWSTST_IVA2, PM_PREPWSTST_CORE shared bits */ |
80 | #define OMAP3430_LASTLOGICSTATEENTERED (1 << 2) | 81 | #define OMAP3430_LASTLOGICSTATEENTERED (1 << 2) |
81 | 82 | ||
82 | /* | 83 | /* |
83 | * PM_PREPWSTST_IVA2, PM_PREPWSTST_MPU, PM_PREPWSTST_CORE, | 84 | * PM_PREPWSTST_IVA2, PM_PREPWSTST_MPU, PM_PREPWSTST_CORE, |
@@ -278,8 +279,10 @@ | |||
278 | #define OMAP3430_EMULATION_MPU_RST (1 << 11) | 279 | #define OMAP3430_EMULATION_MPU_RST (1 << 11) |
279 | 280 | ||
280 | /* PM_WKDEP_MPU specific bits */ | 281 | /* PM_WKDEP_MPU specific bits */ |
281 | #define OMAP3430_PM_WKDEP_MPU_EN_DSS (1 << 5) | 282 | #define OMAP3430_PM_WKDEP_MPU_EN_DSS_SHIFT 5 |
282 | #define OMAP3430_PM_WKDEP_MPU_EN_IVA2 (1 << 2) | 283 | #define OMAP3430_PM_WKDEP_MPU_EN_DSS_MASK (1 << 5) |
284 | #define OMAP3430_PM_WKDEP_MPU_EN_IVA2_SHIFT 2 | ||
285 | #define OMAP3430_PM_WKDEP_MPU_EN_IVA2_MASK (1 << 2) | ||
283 | 286 | ||
284 | /* PM_EVGENCTRL_MPU */ | 287 | /* PM_EVGENCTRL_MPU */ |
285 | #define OMAP3430_OFFLOADMODE_SHIFT 3 | 288 | #define OMAP3430_OFFLOADMODE_SHIFT 3 |