Commit 5e79cc1f authored by Olof Johansson's avatar 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: default avatarOlof Johansson <olof@lixom.net>
parents 70700080 d93023f8
......@@ -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 = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment