diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2016-03-03 20:17:23 +0100 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-03-03 20:21:40 +0100 |
| commit | 27fbd266de34af6eb2759249696bd2b4da7c8434 (patch) | |
| tree | b4dd917681b489f971835817f4b999bd48000bef /drivers/clk/shmobile/clk-div6.c | |
| parent | clk: si5{14,351,70}: Remove CLK_IS_ROOT (diff) | |
| parent | clk: shmobile: r8a7795: Add CAN FD peripheral clock (diff) | |
| download | linux-27fbd266de34af6eb2759249696bd2b4da7c8434.tar.xz linux-27fbd266de34af6eb2759249696bd2b4da7c8434.zip | |
Merge branch 'clk-shmobile-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-next
Pull shmobile clk updates from Geert Uytterhoeven:
- Fix a bug in the div6 clock driver that was exposed by CAN
support on R-Car H3,
- Add more module clocks for R-Car H3.
* 'clk-shmobile-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers:
clk: shmobile: r8a7795: Add CAN FD peripheral clock
clk: shmobile: r8a7795: Add CANFD clock
clk: shmobile: r8a7795: Add CAN peripheral clock
clk: shmobile: div6: Fix .recalc_rate() using a stale divisor
clk: shmobile: r8a7795: Add LVDS module clock
clk: shmobile: r8a7795: Add FCP clocks
Diffstat (limited to 'drivers/clk/shmobile/clk-div6.c')
| -rw-r--r-- | drivers/clk/shmobile/clk-div6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clk/shmobile/clk-div6.c b/drivers/clk/shmobile/clk-div6.c index 999994769450..0627860233cb 100644 --- a/drivers/clk/shmobile/clk-div6.c +++ b/drivers/clk/shmobile/clk-div6.c @@ -82,9 +82,8 @@ static unsigned long cpg_div6_clock_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { struct div6_clock *clock = to_div6_clock(hw); - unsigned int div = (clk_readl(clock->reg) & CPG_DIV6_DIV_MASK) + 1; - return parent_rate / div; + return parent_rate / clock->div; } static unsigned int cpg_div6_clock_calc_div(unsigned long rate, |