summaryrefslogtreecommitdiffstats
path: root/drivers/clk/hisilicon
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2018-01-26 16:42:03 -0800
committerStephen Boyd <sboyd@codeaurora.org>2018-01-26 16:43:14 -0800
commit716d9b1d4a88493ec3e52957cc1026d32534ee67 (patch)
treef1f9c9d73a5527e23e1a476cb2acbdad9e81f09f /drivers/clk/hisilicon
parent0003046477a0c0038bab8c899181faa2e7d86d40 (diff)
parent12a26c298d2a8b1cab498533fa65198e49e3afd3 (diff)
downloadlinux-716d9b1d4a88493ec3e52957cc1026d32534ee67.tar.gz
linux-716d9b1d4a88493ec3e52957cc1026d32534ee67.tar.bz2
linux-716d9b1d4a88493ec3e52957cc1026d32534ee67.zip
Merge branch 'clk-divider-container' into clk-next
* clk-divider-container: clk: divider: fix incorrect usage of container_of Plus fixup sprd/div.c to pass the width too.
Diffstat (limited to 'drivers/clk/hisilicon')
-rw-r--r--drivers/clk/hisilicon/clkdivider-hi6220.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/hisilicon/clkdivider-hi6220.c b/drivers/clk/hisilicon/clkdivider-hi6220.c
index a1c1f684ad58..9f46cf9dcc65 100644
--- a/drivers/clk/hisilicon/clkdivider-hi6220.c
+++ b/drivers/clk/hisilicon/clkdivider-hi6220.c
@@ -56,7 +56,7 @@ static unsigned long hi6220_clkdiv_recalc_rate(struct clk_hw *hw,
val &= div_mask(dclk->width);
return divider_recalc_rate(hw, parent_rate, val, dclk->table,
- CLK_DIVIDER_ROUND_CLOSEST);
+ CLK_DIVIDER_ROUND_CLOSEST, dclk->width);
}
static long hi6220_clkdiv_round_rate(struct clk_hw *hw, unsigned long rate,