diff options
| author | Ryan Mallon | 2010-06-02 02:55:36 +0200 |
|---|---|---|
| committer | Nicolas Ferre | 2010-12-17 12:10:39 +0100 |
| commit | 8251544f9e28058e54c4f35b7cd13b0d191d7555 (patch) | |
| tree | dac7e573319cc79055df4db209b8d1145d1472db /arch/arm/mach-at91 | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify (diff) | |
| download | kernel-qcow2-linux-8251544f9e28058e54c4f35b7cd13b0d191d7555.tar.gz kernel-qcow2-linux-8251544f9e28058e54c4f35b7cd13b0d191d7555.tar.xz kernel-qcow2-linux-8251544f9e28058e54c4f35b7cd13b0d191d7555.zip | |
at91: Fix uhpck clock rate in upll case
The uhpck clock should be divided from the utmi clock, not its parent
(main). This change is mostly cosmetic as the uhpck rate value is not
used anywhere except for the debugfs clock output.
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index 7525cee3983f..9113da6845f1 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c @@ -658,7 +658,7 @@ static void __init at91_upll_usbfs_clock_init(unsigned long main_clock) /* Now set uhpck values */ uhpck.parent = &utmi_clk; uhpck.pmc_mask = AT91SAM926x_PMC_UHP; - uhpck.rate_hz = utmi_clk.parent->rate_hz; + uhpck.rate_hz = utmi_clk.rate_hz; uhpck.rate_hz /= 1 + ((at91_sys_read(AT91_PMC_USB) & AT91_PMC_OHCIUSBDIV) >> 8); } |