diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-06-12 11:49:46 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-06-12 15:51:54 +0200 |
commit | 0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6 (patch) | |
tree | 51382c24cd68a4129cf7bdbbedd84b24c70e47b1 /target/linux/brcm2708/patches-4.4/0256-clk-bcm2835-pll_off-should-only-update-CM_PLL_ANARST.patch | |
parent | 1da87516e584a86d1d056f6b58bfa3050cc875b9 (diff) | |
download | upstream-0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6.tar.gz upstream-0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6.tar.bz2 upstream-0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6.zip |
kernel: update kernel 4.4 to version 4.4.13
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0256-clk-bcm2835-pll_off-should-only-update-CM_PLL_ANARST.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.4/0256-clk-bcm2835-pll_off-should-only-update-CM_PLL_ANARST.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0256-clk-bcm2835-pll_off-should-only-update-CM_PLL_ANARST.patch b/target/linux/brcm2708/patches-4.4/0256-clk-bcm2835-pll_off-should-only-update-CM_PLL_ANARST.patch deleted file mode 100644 index 6199cbe32b..0000000000 --- a/target/linux/brcm2708/patches-4.4/0256-clk-bcm2835-pll_off-should-only-update-CM_PLL_ANARST.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4d4b769727386c6a1b7274e3083cc6b24364b4fa Mon Sep 17 00:00:00 2001 -From: Martin Sperl <kernel@martin.sperl.org> -Date: Mon, 29 Feb 2016 11:39:17 +0000 -Subject: [PATCH 256/381] clk: bcm2835: pll_off should only update - CM_PLL_ANARST - -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. - -Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the -audio domain clocks") - -Signed-off-by: Martin Sperl <kernel@martin.sperl.org> -Signed-off-by: Eric Anholt <eric@anholt.net> -Reviewed-by: Eric Anholt <eric@anholt.net> -(cherry picked from commit 6727f086cfe4ddcc651eb2bf4301abfcf619be06) ---- - drivers/clk/bcm/clk-bcm2835.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - ---- a/drivers/clk/bcm/clk-bcm2835.c -+++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -913,8 +913,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) |