From: Nicolas Ferre Date: Mon, 24 Jun 2013 16:09:25 +0000 (+0200) Subject: ARM: at91/PMC: use at91_usb_rate() for UTMI PLL X-Git-Tag: upstream/snapshot3+hdmi~4844^2^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd2da9ca138e446824a7542b381aed442fef4caa;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Tested-by: Bo Shen --- diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index 661111f..6b2630a 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) /* Now set uhpck values */ uhpck.parent = &utmi_clk; uhpck.pmc_mask = AT91SAM926x_PMC_UHP; - uhpck.rate_hz = utmi_clk.rate_hz; - uhpck.rate_hz /= 1 + ((at91_pmc_read(AT91_PMC_USB) & AT91_PMC_OHCIUSBDIV) >> 8); + uhpck.rate_hz = at91_usb_rate(&utmi_clk, utmi_clk.rate_hz, usbr); } static int __init at91_pmc_init(unsigned long main_clock)