diff options
| author |   Andrew Victor <linux@maxim.org.za> | 2008-01-24 15:10:39 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-26 15:01:13 +0000 |
| commit | 2b3b3516b6eeea1464e205b2dde9ebc9b7dd2ec8 (patch) | |
| tree | 29ec4fd51c8231fd710783effcbaf21b4f80005d /arch/arm/mach-at91/pm.c | |
| parent | [ARM] 4738/1: at91sam9261: Remove udc pullup enabling in board initialisation (diff) | |
| download | linux-dev-2b3b3516b6eeea1464e205b2dde9ebc9b7dd2ec8.tar.xz linux-dev-2b3b3516b6eeea1464e205b2dde9ebc9b7dd2ec8.zip | |
[ARM] 4764/1: [AT91] AT91CAP9 core support
Add support for Atmel's AT91CAP9 Customizable Microcontroller family.
<http://www.atmel.com/products/AT91CAP/Default.asp>
Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 98cb61482917..4b120cc36135 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -80,6 +80,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_at91cap9()) { + if ((scsr & AT91CAP9_PMC_UHP) != 0) { + pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); + return 0; + } } #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS |