Skip to content

Commit

Permalink
ARM: pm: sa1100: no need to re-enable clock switching
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King committed Jun 24, 2011
1 parent b69874e commit 3125af2
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/arm/mach-sa1100/sleep.S
Original file line number Diff line number Diff line change
Expand Up @@ -147,5 +147,4 @@ sa1110_sdram_controller_fix:
*/
.align 5
sa1100_cpu_resume:
mcr p15, 0, r1, c15, c1, 2 @ enable clock switching
ldmfd sp!, {r4 - r12, pc} @ return to caller

0 comments on commit 3125af2

Please sign in to comment.