diff options
author | Paul Walmsley <paul@pwsan.com> | 2009-01-27 21:12:57 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 12:50:25 -0500 |
commit | 207233533dd197457634810c6dc1b5d65ab6b8c7 (patch) | |
tree | 89b38f477d7da4b96f1746d5425dc849f9408f80 /arch/arm/mach-omap2/clock34xx.h | |
parent | 9299fd85a00a52b7c575fa02b3031ad407a15344 (diff) |
[ARM] OMAP3: move USBHOST SAR handling from clock framework to powerdomain layer
Remove usbhost_sar_fclk from the OMAP3 clock framework. The bit that
the clock was tweaking doesn't actually enable or disable a clock; it
controls whether the hardware will save and restore USBHOST state
when the powerdomain changes state. (That happens to coincidentally
enable a clock for the duration of the operation, hence the earlier
confusion.)
In place of the clock, mark the USBHOST powerdomain as supporting
hardware save-and-restore functionality.
linux-omap source commit is f3ceac86a9d425d101d606d87a5af44afef27179.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/clock34xx.h')
-rw-r--r-- | arch/arm/mach-omap2/clock34xx.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index f811a0978512..a2dcf574d98a 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h | |||
@@ -2218,17 +2218,6 @@ static struct clk usbhost_ick = { | |||
2218 | .recalc = &followparent_recalc, | 2218 | .recalc = &followparent_recalc, |
2219 | }; | 2219 | }; |
2220 | 2220 | ||
2221 | static struct clk usbhost_sar_fck = { | ||
2222 | .name = "usbhost_sar_fck", | ||
2223 | .ops = &clkops_omap2_dflt, | ||
2224 | .parent = &osc_sys_ck, | ||
2225 | .init = &omap2_init_clk_clkdm, | ||
2226 | .enable_reg = OMAP_PRM_REGADDR(OMAP3430ES2_USBHOST_MOD, PM_PWSTCTRL), | ||
2227 | .enable_bit = OMAP3430ES2_SAVEANDRESTORE_SHIFT, | ||
2228 | .clkdm_name = "usbhost_clkdm", | ||
2229 | .recalc = &followparent_recalc, | ||
2230 | }; | ||
2231 | |||
2232 | /* WKUP */ | 2221 | /* WKUP */ |
2233 | 2222 | ||
2234 | static const struct clksel_rate usim_96m_rates[] = { | 2223 | static const struct clksel_rate usim_96m_rates[] = { |