diff options
Diffstat (limited to 'arch/arm/mach-omap1/pm.c')
| -rw-r--r-- | arch/arm/mach-omap1/pm.c | 7 | 
1 files changed, 5 insertions, 2 deletions
| diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index ddf6b07dc9c7..1b4e1d57afb1 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | //kernel/linux-omap-fsample/arch/arm/mach-omap1/pm.c#3 - integrate change 4545 (text) | ||
| 1 | /* | 2 | /* | 
| 2 | * linux/arch/arm/mach-omap1/pm.c | 3 | * linux/arch/arm/mach-omap1/pm.c | 
| 3 | * | 4 | * | 
| @@ -50,6 +51,7 @@ | |||
| 50 | #include <asm/mach/irq.h> | 51 | #include <asm/mach/irq.h> | 
| 51 | #include <asm/mach-types.h> | 52 | #include <asm/mach-types.h> | 
| 52 | 53 | ||
| 54 | #include <asm/arch/cpu.h> | ||
| 53 | #include <asm/arch/irqs.h> | 55 | #include <asm/arch/irqs.h> | 
| 54 | #include <asm/arch/clock.h> | 56 | #include <asm/arch/clock.h> | 
| 55 | #include <asm/arch/sram.h> | 57 | #include <asm/arch/sram.h> | 
| @@ -326,8 +328,9 @@ void omap_pm_suspend(void) | |||
| 326 | /* stop DSP */ | 328 | /* stop DSP */ | 
| 327 | omap_writew(omap_readw(ARM_RSTCT1) & ~(1 << DSP_EN), ARM_RSTCT1); | 329 | omap_writew(omap_readw(ARM_RSTCT1) & ~(1 << DSP_EN), ARM_RSTCT1); | 
| 328 | 330 | ||
| 329 | /* shut down dsp_ck */ | 331 | /* shut down dsp_ck */ | 
| 330 | omap_writew(omap_readw(ARM_CKCTL) & ~(1 << EN_DSPCK), ARM_CKCTL); | 332 | if (!cpu_is_omap730()) | 
| 333 | omap_writew(omap_readw(ARM_CKCTL) & ~(1 << EN_DSPCK), ARM_CKCTL); | ||
| 331 | 334 | ||
| 332 | /* temporarily enabling api_ck to access DSP registers */ | 335 | /* temporarily enabling api_ck to access DSP registers */ | 
| 333 | omap_writew(omap_readw(ARM_IDLECT2) | 1 << EN_APICK, ARM_IDLECT2); | 336 | omap_writew(omap_readw(ARM_IDLECT2) | 1 << EN_APICK, ARM_IDLECT2); | 
