From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 21 Jun 2011 17:59:33 +0000 (+0100)
Subject: ARM: pm: sa1100: no need to re-enable clock switching
X-Git-Tag: next-20110726~107^2~1^8~26
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3125af241cdb5a2421aad9f710b2744228a79084;p=karo-tx-linux.git

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>
---

diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S
index 04f2a618d4ef..122ab3c66923 100644
--- a/arch/arm/mach-sa1100/sleep.S
+++ b/arch/arm/mach-sa1100/sleep.S
@@ -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