diff options
| author |   Olof Johansson <olof@lixom.net> | 2014-03-17 00:48:44 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-17 00:48:44 -0700 |
| commit | 5e79cc1f4088ec7f97391c4f4f02218a6c9f9452 (patch) | |
| tree | 5dbefafb4f5f6d9fffb6b03ef5f019b8d5995c7c /arch/arm/mach-shmobile | |
| parent | Merge tag 'renesas-clock2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers (diff) | |
| parent | ARM: shmobile: r7s72100: fix bus clock calculation (diff) | |
| download | linux-dev-5e79cc1f4088ec7f97391c4f4f02218a6c9f9452.tar.xz linux-dev-5e79cc1f4088ec7f97391c4f4f02218a6c9f9452.zip | |
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>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/clock-r7s72100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c index f17a5db00221..bee0073c9b64 100644 --- a/arch/arm/mach-shmobile/clock-r7s72100.c +++ b/arch/arm/mach-shmobile/clock-r7s72100.c @@ -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 = { |