Linux v4.9.2
This commit is contained in:
parent
3b2fd6a7fc
commit
7a011b1bac
|
@ -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
|
||||
|
|
|
@ -54,7 +54,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 0
|
||||
%define stable_update 2
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev %{stable_update}
|
||||
|
@ -2175,6 +2175,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Jan 09 2017 Laura Abbott <labbott@fedoraproject.org>
|
||||
- Linux v4.9.2
|
||||
|
||||
* Mon Jan 9 2017 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
- Add patch to improve MMC/SD speed on Raspberry Pi (bcm283x)
|
||||
|
||||
|
|
1
sources
1
sources
|
@ -1,2 +1,3 @@
|
|||
SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
|
||||
SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99
|
||||
SHA512 (patch-4.9.2.xz) = b7033105561d9829151dd1d374baa7f3e19e2ae767dc3a7a0abcf0be7bc821346deb5748809b146847b44f910243fef50a3db32f664ff88a54c37938852bfcb6
|
||||
|
|
Loading…
Reference in New Issue