Commit 5e79cc1f authored Mar 17, 2014 by Olof Johansson

Merge tag 'renesas-clock3-for-v3.15' of...

Merge tag 'renesas-clock3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Merge "Third Round of Renesas ARM Based SoC Clock Updates for v3.15" from Simon
Horman:

r7s72100 (RZ/A1H) SoC
* Correct bus clock calculation

* tag 'renesas-clock3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r7s72100: fix bus clock calculation

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 70700080 d93023f8

arch/arm/mach-shmobile/clock-r7s72100.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ static struct clk pll_clk = {

		static unsigned long bus_recalc(struct clk *clk)
		{
		return clk->parent->rate * 2 / 3;
		return clk->parent->rate / 3;
		}

		static struct sh_clk_ops bus_clk_ops = {