diff options
| author | Brian Swetland <swetland@google.com> | 2006-06-26 16:16:03 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2006-06-26 16:16:03 -0700 |
| commit | 495f71db30e279a5a696fa6622fc75451caa8366 (patch) | |
| tree | 84c923fe4688dc88ecf696885a13b7ad42695100 /arch/arm/mach-omap1/pm.c | |
| parent | ffb7a80f932550590ef54791b60db7e6ffce63f3 (diff) | |
| download | kernel_samsung_aries-495f71db30e279a5a696fa6622fc75451caa8366.zip kernel_samsung_aries-495f71db30e279a5a696fa6622fc75451caa8366.tar.gz kernel_samsung_aries-495f71db30e279a5a696fa6622fc75451caa8366.tar.bz2 | |
ARM: OMAP: Add core fsample support
This patch adds core support for the TI F-Sample Board (OMAP 850).
Signed-off-by: Brian Swetland <swetland@google.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
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 ddf6b07..1b4e1d5 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -1,3 +1,4 @@ +//kernel/linux-omap-fsample/arch/arm/mach-omap1/pm.c#3 - integrate change 4545 (text) /* * linux/arch/arm/mach-omap1/pm.c * @@ -50,6 +51,7 @@ #include <asm/mach/irq.h> #include <asm/mach-types.h> +#include <asm/arch/cpu.h> #include <asm/arch/irqs.h> #include <asm/arch/clock.h> #include <asm/arch/sram.h> @@ -326,8 +328,9 @@ void omap_pm_suspend(void) /* stop DSP */ omap_writew(omap_readw(ARM_RSTCT1) & ~(1 << DSP_EN), ARM_RSTCT1); - /* shut down dsp_ck */ - omap_writew(omap_readw(ARM_CKCTL) & ~(1 << EN_DSPCK), ARM_CKCTL); + /* shut down dsp_ck */ + if (!cpu_is_omap730()) + omap_writew(omap_readw(ARM_CKCTL) & ~(1 << EN_DSPCK), ARM_CKCTL); /* temporarily enabling api_ck to access DSP registers */ omap_writew(omap_readw(ARM_IDLECT2) | 1 << EN_APICK, ARM_IDLECT2); |