diff options
Diffstat (limited to 'arch/arm/mach-omap2/prm.h')
-rw-r--r-- | arch/arm/mach-omap2/prm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h index bbf41fc8e9a9..e4dc4b17881d 100644 --- a/arch/arm/mach-omap2/prm.h +++ b/arch/arm/mach-omap2/prm.h | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | #ifndef __ASSEMBLER__ | 19 | #ifndef __ASSEMBLER__ |
20 | #define OMAP_PRM_REGADDR(module, reg) \ | 20 | #define OMAP_PRM_REGADDR(module, reg) \ |
21 | (void __iomem *)IO_ADDRESS(OMAP2_PRM_BASE + (module) + (reg)) | 21 | IO_ADDRESS(OMAP2_PRM_BASE + (module) + (reg)) |
22 | #else | 22 | #else |
23 | #define OMAP2420_PRM_REGADDR(module, reg) \ | 23 | #define OMAP2420_PRM_REGADDR(module, reg) \ |
24 | IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg)) | 24 | IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg)) |
@@ -305,7 +305,8 @@ static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) | |||
305 | * 3430: PM_WKDEP_IVA2, PM_WKDEP_GFX, PM_WKDEP_DSS, PM_WKDEP_CAM, | 305 | * 3430: PM_WKDEP_IVA2, PM_WKDEP_GFX, PM_WKDEP_DSS, PM_WKDEP_CAM, |
306 | * PM_WKDEP_PER | 306 | * PM_WKDEP_PER |
307 | */ | 307 | */ |
308 | #define OMAP_EN_WKUP (1 << 4) | 308 | #define OMAP_EN_WKUP_SHIFT 4 |
309 | #define OMAP_EN_WKUP_MASK (1 << 4) | ||
309 | 310 | ||
310 | /* | 311 | /* |
311 | * 24XX: PM_PWSTCTRL_MPU, PM_PWSTCTRL_CORE, PM_PWSTCTRL_GFX, | 312 | * 24XX: PM_PWSTCTRL_MPU, PM_PWSTCTRL_CORE, PM_PWSTCTRL_GFX, |