From 38e181589837de39050f59242c2c605d29c7b469 Mon Sep 17 00:00:00 2001 From: Andrew Victor Date: Thu, 31 May 2007 09:34:53 +0100 Subject: [PATCH] --- yaml --- r: 57409 b: refs/heads/master c: b6b27ae5e85fb193c08448157943b187958b8ca2 h: refs/heads/master i: 57407: 6b51bf8369e55a90ae9df17bfd957c2ea750d557 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/pm.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c7653556561f..8b019d282c38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f4b49a4293ea7b0adeaeae37207b9c9fd2dd7c2 +refs/heads/master: b6b27ae5e85fb193c08448157943b187958b8ca2 diff --git a/trunk/arch/arm/mach-at91/pm.c b/trunk/arch/arm/mach-at91/pm.c index ff8db29e989e..47ff676aca5f 100644 --- a/trunk/arch/arm/mach-at91/pm.c +++ b/trunk/arch/arm/mach-at91/pm.c @@ -76,12 +76,11 @@ static int at91_pm_verify_clocks(void) pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); return 0; } - } else if (cpu_is_at91sam9260()) { -#warning "Check SAM9260 USB clocks" - } else if (cpu_is_at91sam9261()) { -#warning "Check SAM9261 USB clocks" - } else if (cpu_is_at91sam9263()) { -#warning "Check SAM9263 USB clocks" + } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263()) { + if ((scsr & (AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP)) != 0) { + pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); + return 0; + } } #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS