diff options
author | Ryan Mallon <ryan@bluewatersys.com> | 2009-04-01 15:33:30 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-01 17:18:19 -0400 |
commit | 7f96b1caac43b34b325ee4acf61ce57d7214409c (patch) | |
tree | 72b3cead74193f2076df2185566ae66c4ed102a1 /arch/arm/mach-at91/pm.c | |
parent | f2255be8126e86142901c61dd482c1c2a5ffdda7 (diff) |
[ARM] 5441/1: Use pr_err on error paths in at91 pm
Change pr_debug to pr_err on error paths in the AT91 power management
code. All of the errors will result in the cpu not going into the
suspend state. This patch makes it possible to identify problems with
suspend when power management debugging is not enabled.
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91/pm.c')
-rw-r--r-- | arch/arm/mach-at91/pm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 7ac812dc055a..e26c4fe61fae 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
@@ -198,17 +198,17 @@ static int at91_pm_verify_clocks(void) | |||
198 | /* USB must not be using PLLB */ | 198 | /* USB must not be using PLLB */ |
199 | if (cpu_is_at91rm9200()) { | 199 | if (cpu_is_at91rm9200()) { |
200 | if ((scsr & (AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP)) != 0) { | 200 | if ((scsr & (AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP)) != 0) { |
201 | pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); | 201 | pr_err("AT91: PM - Suspend-to-RAM with USB still active\n"); |
202 | return 0; | 202 | return 0; |
203 | } | 203 | } |
204 | } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) { | 204 | } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) { |
205 | if ((scsr & (AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP)) != 0) { | 205 | if ((scsr & (AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP)) != 0) { |
206 | pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); | 206 | pr_err("AT91: PM - Suspend-to-RAM with USB still active\n"); |
207 | return 0; | 207 | return 0; |
208 | } | 208 | } |
209 | } else if (cpu_is_at91cap9()) { | 209 | } else if (cpu_is_at91cap9()) { |
210 | if ((scsr & AT91CAP9_PMC_UHP) != 0) { | 210 | if ((scsr & AT91CAP9_PMC_UHP) != 0) { |
211 | pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); | 211 | pr_err("AT91: PM - Suspend-to-RAM with USB still active\n"); |
212 | return 0; | 212 | return 0; |
213 | } | 213 | } |
214 | } | 214 | } |
@@ -223,7 +223,7 @@ static int at91_pm_verify_clocks(void) | |||
223 | 223 | ||
224 | css = at91_sys_read(AT91_PMC_PCKR(i)) & AT91_PMC_CSS; | 224 | css = at91_sys_read(AT91_PMC_PCKR(i)) & AT91_PMC_CSS; |
225 | if (css != AT91_PMC_CSS_SLOW) { | 225 | if (css != AT91_PMC_CSS_SLOW) { |
226 | pr_debug("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css); | 226 | pr_err("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css); |
227 | return 0; | 227 | return 0; |
228 | } | 228 | } |
229 | } | 229 | } |