diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-21 13:59:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-24 03:47:15 -0400 |
| commit | 3125af241cdb5a2421aad9f710b2744228a79084 (patch) | |
| tree | 8b8226b303761399ab0de73d1ad384b3175995e5 /arch/arm/mach-sa1100 | |
| parent | b69874e4f530b0103e507f695c010d00cb85a4df (diff) | |
ARM: pm: sa1100: no need to re-enable clock switching
This is now taken care of by calling cpu_proc_init() in the resume
path, so eliminate this unnecessary call.
Tested-by: Kevin Hilman <khilman@ti.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/sleep.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S index 04f2a618d4e..122ab3c6692 100644 --- a/arch/arm/mach-sa1100/sleep.S +++ b/arch/arm/mach-sa1100/sleep.S | |||
| @@ -147,5 +147,4 @@ sa1110_sdram_controller_fix: | |||
| 147 | */ | 147 | */ |
| 148 | .align 5 | 148 | .align 5 |
| 149 | sa1100_cpu_resume: | 149 | sa1100_cpu_resume: |
| 150 | mcr p15, 0, r1, c15, c1, 2 @ enable clock switching | ||
| 151 | ldmfd sp!, {r4 - r12, pc} @ return to caller | 150 | ldmfd sp!, {r4 - r12, pc} @ return to caller |