diff options
author | Wenyou Yang <wenyou.yang@atmel.com> | 2015-03-08 23:44:03 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-13 06:11:57 -0400 |
commit | 05d5970c723cb6d11cef793c77cd07d86d5d4a94 (patch) | |
tree | 06cc3b465c386cc7d2cd8893789c67a9e21dff1f | |
parent | 047794e13632f177e864eba6160cecfbf3875cbe (diff) |
ARM: at91/pm_slowclock: remove the unused code related with SLOWDOWN_MASTER_CLOCK
The SLOWDOWN_MASTER_CLOCK definition is not used, remove the redundant code.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Tested-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/mach-at91/pm_slowclock.S | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_slowclock.S index 931f0e302c03..6022d2d8c267 100644 --- a/arch/arm/mach-at91/pm_slowclock.S +++ b/arch/arm/mach-at91/pm_slowclock.S | |||
@@ -11,20 +11,11 @@ | |||
11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
12 | * | 12 | * |
13 | */ | 13 | */ |
14 | |||
15 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
16 | #include <linux/clk/at91_pmc.h> | 15 | #include <linux/clk/at91_pmc.h> |
17 | #include <mach/hardware.h> | 16 | #include <mach/hardware.h> |
18 | #include <mach/at91_ramc.h> | 17 | #include <mach/at91_ramc.h> |
19 | 18 | ||
20 | /* | ||
21 | * When SLOWDOWN_MASTER_CLOCK is defined we will also slow down the Master | ||
22 | * clock during suspend by adjusting its prescalar and divisor. | ||
23 | * NOTE: This hasn't been shown to be stable on SAM9s; and on the RM9200 there | ||
24 | * are errata regarding adjusting the prescalar and divisor. | ||
25 | */ | ||
26 | #undef SLOWDOWN_MASTER_CLOCK | ||
27 | |||
28 | pmc .req r0 | 19 | pmc .req r0 |
29 | sdramc .req r1 | 20 | sdramc .req r1 |
30 | ramc1 .req r2 | 21 | ramc1 .req r2 |
@@ -177,18 +168,6 @@ sdr_sr_done: | |||
177 | 168 | ||
178 | wait_mckrdy | 169 | wait_mckrdy |
179 | 170 | ||
180 | #ifdef SLOWDOWN_MASTER_CLOCK | ||
181 | /* | ||
182 | * Set the Master Clock PRES and MDIV fields. | ||
183 | * | ||
184 | * See AT91RM9200 errata #27 and #28 for details. | ||
185 | */ | ||
186 | mov tmp1, #0 | ||
187 | str tmp1, [pmc, #AT91_PMC_MCKR] | ||
188 | |||
189 | wait_mckrdy | ||
190 | #endif | ||
191 | |||
192 | /* Save PLLA setting and disable it */ | 171 | /* Save PLLA setting and disable it */ |
193 | ldr tmp1, [pmc, #AT91_CKGR_PLLAR] | 172 | ldr tmp1, [pmc, #AT91_CKGR_PLLAR] |
194 | str tmp1, .saved_pllar | 173 | str tmp1, .saved_pllar |
@@ -245,22 +224,6 @@ sdr_sr_done: | |||
245 | wait_pllalock | 224 | wait_pllalock |
246 | 4: | 225 | 4: |
247 | 226 | ||
248 | #ifdef SLOWDOWN_MASTER_CLOCK | ||
249 | /* | ||
250 | * First set PRES if it was not 0, | ||
251 | * than set CSS and MDIV fields. | ||
252 | * | ||
253 | * See AT91RM9200 errata #27 and #28 for details. | ||
254 | */ | ||
255 | ldr tmp1, .saved_mckr | ||
256 | tst tmp1, #AT91_PMC_PRES | ||
257 | beq 2f | ||
258 | and tmp1, tmp1, #AT91_PMC_PRES | ||
259 | str tmp1, [pmc, #AT91_PMC_MCKR] | ||
260 | |||
261 | wait_mckrdy | ||
262 | #endif | ||
263 | |||
264 | /* | 227 | /* |
265 | * Restore master clock setting | 228 | * Restore master clock setting |
266 | */ | 229 | */ |