Commit b6b27ae5 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King

[ARM] 4419/1: AT91: SAM9 USB clocks check for suspending

When suspending to slow-clock mode, at91_pm_verify_clocks() is called to
ensure that all the clocks are disabled or in the correct state.

This patch replaces the "#warning TODO" messages for the SAM9 processors
with the correct code.
Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1f4b49a4
...@@ -76,12 +76,11 @@ static int at91_pm_verify_clocks(void) ...@@ -76,12 +76,11 @@ static int at91_pm_verify_clocks(void)
pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n"); pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");
return 0; return 0;
} }
} else if (cpu_is_at91sam9260()) { } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263()) {
#warning "Check SAM9260 USB clocks" if ((scsr & (AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP)) != 0) {
} else if (cpu_is_at91sam9261()) { pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");
#warning "Check SAM9261 USB clocks" return 0;
} else if (cpu_is_at91sam9263()) { }
#warning "Check SAM9263 USB clocks"
} }
#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment