aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/clock.c
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2013-06-24 12:09:25 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-06-26 09:24:11 -0400
commitbd2da9ca138e446824a7542b381aed442fef4caa (patch)
tree054503d417ac93b0d6c8cab473da19407ec22e53 /arch/arm/mach-at91/clock.c
parentd04e5b694e996e7cbbe3748924a259a647c3456d (diff)
ARM: at91/PMC: use at91_usb_rate() for UTMI PLL
We are using this function, now that we have introduced the support for UTMI clock for computing the USB host rate. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Tested-by: Bo Shen <voice.shen@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/clock.c')
-rw-r--r--arch/arm/mach-at91/clock.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 661111fd76ac..6b2630a92f71 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -742,8 +742,7 @@ static void __init at91_upll_usbfs_clock_init(unsigned long main_clock)
742 /* Now set uhpck values */ 742 /* Now set uhpck values */
743 uhpck.parent = &utmi_clk; 743 uhpck.parent = &utmi_clk;
744 uhpck.pmc_mask = AT91SAM926x_PMC_UHP; 744 uhpck.pmc_mask = AT91SAM926x_PMC_UHP;
745 uhpck.rate_hz = utmi_clk.rate_hz; 745 uhpck.rate_hz = at91_usb_rate(&utmi_clk, utmi_clk.rate_hz, usbr);
746 uhpck.rate_hz /= 1 + ((at91_pmc_read(AT91_PMC_USB) & AT91_PMC_OHCIUSBDIV) >> 8);
747} 746}
748 747
749static int __init at91_pmc_init(unsigned long main_clock) 748static int __init at91_pmc_init(unsigned long main_clock)