From: Ryan Mallon Date: Wed, 2 Jun 2010 00:55:36 +0000 (+1200) Subject: at91: Fix uhpck clock rate in upll case X-Git-Tag: upstream/snapshot3+hdmi~12243^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8251544f9e28058e54c4f35b7cd13b0d191d7555;hp=a3383e8372c0c11238f9bb9777929bfc3a2d320a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: Nicolas Ferre --- diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index 7525cee..9113da6 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); }