diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:16:24 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:16:24 +0800 |
| commit | fe4c808f845e2ff3a3fb6c66009ab69c8d01bf57 (patch) | |
| tree | 82ce8b6476c1c4c84ab05a49c94317f1ce8ac1b7 /drivers/clk/qcom/gcc-msm8960.c | |
| parent | bbe8f0ee88a1eb4bb1e72e593b008faf387f30ac (diff) | |
| parent | 0ac0a856d986c1ab240753479f5e50fdfab82b14 (diff) | |
Merge tag 'v3.18.37' into linux-linaro-lsk-v3.18lsk-v3.18-16.07
This is the 3.18.37 stable release
Diffstat (limited to 'drivers/clk/qcom/gcc-msm8960.c')
| -rw-r--r-- | drivers/clk/qcom/gcc-msm8960.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c index 007534f7a2d7..9004a4e88800 100644 --- a/drivers/clk/qcom/gcc-msm8960.c +++ b/drivers/clk/qcom/gcc-msm8960.c @@ -2740,7 +2740,7 @@ static struct clk_rcg ce3_src = { }, .freq_tbl = clk_tbl_ce3, .clkr = { - .enable_reg = 0x2c08, + .enable_reg = 0x36c0, .enable_mask = BIT(7), .hw.init = &(struct clk_init_data){ .name = "ce3_src", @@ -2756,7 +2756,7 @@ static struct clk_branch ce3_core_clk = { .halt_reg = 0x2fdc, .halt_bit = 5, .clkr = { - .enable_reg = 0x36c4, + .enable_reg = 0x36cc, .enable_mask = BIT(4), .hw.init = &(struct clk_init_data){ .name = "ce3_core_clk", |