diff options
author | popcornmix <popcornmix@gmail.com> | 2016-09-15 13:20:44 +0100 |
---|---|---|
committer | popcornmix <popcornmix@gmail.com> | 2016-09-15 13:20:44 +0100 |
commit | 2d31cd571e6f2ac61a3eda273d973058e1bb1f58 (patch) | |
tree | 640893fdb9ce69915cde3f189cff835ce4d6c3fa /drivers/clk/clk-xgene.c | |
parent | 24e62728b3fc4f118c8ae17b374bce189bb188fc (diff) | |
parent | 1d074db69c46d62ce82b331c2080e2fcb710bf4a (diff) |
Merge remote-tracking branch 'stable/linux-4.4.y' into rpi-4.4.yraspberrypi-kernel_1.20160921-1
Diffstat (limited to 'drivers/clk/clk-xgene.c')
-rw-r--r-- | drivers/clk/clk-xgene.c | 3 |
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); |