Patch "clk: bcm2835: pll_off should only update CM_PLL_ANARST" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

clk: bcm2835: pll_off should only update CM_PLL_ANARST

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
clk-bcm2835-pll_off-should-only-update-cm_pll_anarst.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Martin Sperl <[email protected]>
Date: Mon, 29 Feb 2016 11:39:17 +0000
Subject: clk: bcm2835: pll_off should only update CM_PLL_ANARST

From: Martin Sperl <[email protected]>

commit 6727f086cfe4ddcc651eb2bf4301abfcf619be06 upstream.

bcm2835_pll_off is currently assigning CM_PLL_ANARST to the control register, which may lose the other bits that are currently set by the clock dividers.

It also now locks during the read/modify/write cycle of both registers.

audio domain clocks")

---
 drivers/clk/bcm/clk-bcm2835.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

@@ -890,8 +890,14 @@ static void bcm2835_pll_off(struct clk_h
 	struct bcm2835_cprman *cprman = pll->cprman;
 	const struct bcm2835_pll_data *data = pll->data;
 
-	cprman_write(cprman, data->cm_ctrl_reg, CM_PLL_ANARST);
-	cprman_write(cprman, data->a2w_ctrl_reg, A2W_PLL_CTRL_PWRDN);
+	spin_lock(&cprman->regs_lock);
+	cprman_write(cprman, data->cm_ctrl_reg,
+		     cprman_read(cprman, data->cm_ctrl_reg) |
+		     CM_PLL_ANARST);
+	cprman_write(cprman, data->a2w_ctrl_reg,
+		     cprman_read(cprman, data->a2w_ctrl_reg) |
+		     A2W_PLL_CTRL_PWRDN);
+	spin_unlock(&cprman->regs_lock);
 }
 
 static int bcm2835_pll_on(struct clk_hw *hw)

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/clk-bcm2835-pll_off-should-only-update-cm_pll_anarst.patch queue-4.4/clk-bcm2835-divider-value-has-to-be-1-or-more.patch