summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorLoc Ho <lho@apm.com>2015-11-19 12:20:30 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-15 08:27:39 +0200
commit4aa1324340dabca412d39ba98de7eabd495af7f0 (patch)
treecb34b30f440e7da003b7e103f7bcfb51e9b392b6 /drivers/clk
parentc6210760f2428690255e1fd91cf084b12e827a0a (diff)
downloadlinux-stable-4aa1324340dabca412d39ba98de7eabd495af7f0.tar.gz
linux-stable-4aa1324340dabca412d39ba98de7eabd495af7f0.tar.bz2
linux-stable-4aa1324340dabca412d39ba98de7eabd495af7f0.zip
clk: xgene: Fix divider with non-zero shift value
[ Upstream commit 1382ea631ddddb634850a3795527db0feeff5aaf ] The X-Gene clock driver missed the divider shift operation when set the divider value. Signed-off-by: Loc Ho <lho@apm.com> Fixes: 308964caeebc ("clk: Add APM X-Gene SoC clock driver") Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/clk-xgene.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/clk-xgene.c b/drivers/clk/clk-xgene.c
index 27c0da29eca3..10224b01b97c 100644
--- a/drivers/clk/clk-xgene.c
+++ b/drivers/clk/clk-xgene.c
@@ -351,7 +351,8 @@ static int xgene_clk_set_rate(struct clk_hw *hw, unsigned long rate,
/* Set new divider */
data = xgene_clk_read(pclk->param.divider_reg +
pclk->param.reg_divider_offset);
- data &= ~((1 << pclk->param.reg_divider_width) - 1);
+ data &= ~((1 << pclk->param.reg_divider_width) - 1)
+ << pclk->param.reg_divider_shift;
data |= divider;
xgene_clk_write(data, pclk->param.divider_reg +
pclk->param.reg_divider_offset);