diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-06-03 15:55:46 -0500 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-06-03 15:55:46 -0500 |
| commit | b21b3ad5e1594bce21d418817518aef0b6f47a6a (patch) | |
| tree | 4835a6ad7444dcb9ddaee52f48d788d3b19c712c /drivers/clk | |
| parent | 60ca3e7d38f09cfcd0d59705dc4af9ceb3ee7cdd (diff) | |
| parent | 351d2d4d3108a9a0f0e112dabbc36c2b1446e4f8 (diff) | |
| download | talos-obmc-linux-b21b3ad5e1594bce21d418817518aef0b6f47a6a.tar.gz talos-obmc-linux-b21b3ad5e1594bce21d418817518aef0b6f47a6a.zip | |
Merge tag 'v4.4.12' into dev-4.4
This is the 4.4.12 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/bcm/clk-bcm2835.c | 4 | ||||
| -rw-r--r-- | drivers/clk/qcom/gcc-msm8916.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index 4f9830c1b121..185a4d859638 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1068,10 +1068,12 @@ static void bcm2835_pll_divider_off(struct clk_hw *hw) struct bcm2835_cprman *cprman = divider->cprman; const struct bcm2835_pll_divider_data *data = divider->data; + spin_lock(&cprman->regs_lock); cprman_write(cprman, data->cm_reg, (cprman_read(cprman, data->cm_reg) & ~data->load_mask) | data->hold_mask); cprman_write(cprman, data->a2w_reg, A2W_PLL_CHANNEL_DISABLE); + spin_unlock(&cprman->regs_lock); } static int bcm2835_pll_divider_on(struct clk_hw *hw) @@ -1080,12 +1082,14 @@ static int bcm2835_pll_divider_on(struct clk_hw *hw) struct bcm2835_cprman *cprman = divider->cprman; const struct bcm2835_pll_divider_data *data = divider->data; + spin_lock(&cprman->regs_lock); cprman_write(cprman, data->a2w_reg, cprman_read(cprman, data->a2w_reg) & ~A2W_PLL_CHANNEL_DISABLE); cprman_write(cprman, data->cm_reg, cprman_read(cprman, data->cm_reg) & ~data->hold_mask); + spin_unlock(&cprman->regs_lock); return 0; } diff --git a/drivers/clk/qcom/gcc-msm8916.c b/drivers/clk/qcom/gcc-msm8916.c index d0a0313d6bef..2e7f03d50f4e 100644 --- a/drivers/clk/qcom/gcc-msm8916.c +++ b/drivers/clk/qcom/gcc-msm8916.c @@ -2346,6 +2346,7 @@ static struct clk_branch gcc_crypto_ahb_clk = { "pcnoc_bfdcd_clk_src", }, .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_ops, }, }, @@ -2381,6 +2382,7 @@ static struct clk_branch gcc_crypto_clk = { "crypto_clk_src", }, .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_ops, }, }, |
