Patch "clk: bcm2835: Avoid overwriting the div info when disabling a pll_div clk" has been added to the 4.4-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
clk: bcm2835: Avoid overwriting the div info when disabling a pll_div clk
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-avoid-overwriting-the-div-info-when-disabling-a-pll_div-clk.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.
Quoted 1 line
From
68af4fa8f39b542a6cde7ac19518d88e9b3099dcMon Sep 17 00:00:00 2001
From: Boris Brezillon <[email protected]>
Date: Thu, 1 Dec 2016 20:27:21 +0100
Subject: clk: bcm2835: Avoid overwriting the div info when disabling a pll_div clk
From: Boris Brezillon <[email protected]>
commit 68af4fa8f39b542a6cde7ac19518d88e9b3099dc upstream.
bcm2835_pll_divider_off() is resetting the divider field in the A2W reg to zero when disabling the clock.
Make sure we preserve this value by reading the previous a2w_reg value first and ORing the result with A2W_PLL_CHANNEL_DISABLE.
--- drivers/clk/bcm/clk-bcm2835.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clk/bcm/clk-bcm2835.c +3 -1
@@ -1082,7 +1082,9 @@ static void bcm2835_pll_divider_off(strucprman_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 ); +cprman_write (cprman, data->a2w_reg, +cprman_read (cprman, data->a2w_reg) | +A2W_PLL_CHANNEL_DISABLE );spin_unlock (&cprman->regs_lock); }
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/clk-bcm2835-avoid-overwriting-the-div-info-when-disabling-a-pll_div-clk.patch