diff options
Diffstat (limited to 'bcm283x-fixes.patch')
| -rw-r--r-- | bcm283x-fixes.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/bcm283x-fixes.patch b/bcm283x-fixes.patch index b9f1b115a..07abd3aa4 100644 --- a/bcm283x-fixes.patch +++ b/bcm283x-fixes.patch @@ -698,45 +698,6 @@ index 8c7763f..836d075 100644 -- 2.9.3 -From 68af4fa8f39b542a6cde7ac19518d88e9b3099dc Mon Sep 17 00:00:00 2001 -From: Boris Brezillon <boris.brezillon@free-electrons.com> -Date: Thu, 1 Dec 2016 20:27:21 +0100 -Subject: [PATCH 11732/13183] clk: bcm2835: Avoid overwriting the div info when - disabling a pll_div clk - -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. - -Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> -Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks") -Cc: <stable@vger.kernel.org> -Reviewed-by: Eric Anholt <eric@anholt.net> -Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> ---- - drivers/clk/bcm/clk-bcm2835.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 836d075..2acaa77 100644 ---- a/drivers/clk/bcm/clk-bcm2835.c -+++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -751,7 +751,9 @@ static void bcm2835_pll_divider_off(struct clk_hw *hw) - 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); -+ cprman_write(cprman, data->a2w_reg, -+ cprman_read(cprman, data->a2w_reg) | -+ A2W_PLL_CHANNEL_DISABLE); - spin_unlock(&cprman->regs_lock); - } - --- -2.9.3 - commit 84c39b8b7d46883f7a7514c7d55909831aa846fd Author: Arvind Yadav <arvind.yadav.cs@gmail.com> Date: Wed Sep 21 23:03:57 2016 +0530 |