diff options
author | Alvaro Fernández Rojas <noltari@gmail.com> | 2016-06-20 23:24:50 +0200 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-06-20 23:24:50 +0200 |
commit | 2dc1e11c688a439084692e0b86d20adc0310d42c (patch) | |
tree | 75d7685ac955c38262433c6b8757cd1169b63e35 /target/linux/brcm2708/patches-4.4/0267-clk-bcm2835-Fix-PLL-poweron.patch | |
parent | 14cd93c1ec0fecdd49d5bbf9ebec1a9bf02d6803 (diff) | |
download | master-187ad058-2dc1e11c688a439084692e0b86d20adc0310d42c.tar.gz master-187ad058-2dc1e11c688a439084692e0b86d20adc0310d42c.tar.bz2 master-187ad058-2dc1e11c688a439084692e0b86d20adc0310d42c.zip |
As usual these patches were extracted from the raspberry pi repo:
https://github.com/raspberrypi/linux/tree/rpi-4.4.y
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0267-clk-bcm2835-Fix-PLL-poweron.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.4/0267-clk-bcm2835-Fix-PLL-poweron.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0267-clk-bcm2835-Fix-PLL-poweron.patch b/target/linux/brcm2708/patches-4.4/0267-clk-bcm2835-Fix-PLL-poweron.patch new file mode 100644 index 0000000000..1940b937af --- /dev/null +++ b/target/linux/brcm2708/patches-4.4/0267-clk-bcm2835-Fix-PLL-poweron.patch @@ -0,0 +1,32 @@ +From 66350cdbb13029d143f99c97b0953805afe2f175 Mon Sep 17 00:00:00 2001 +From: Eric Anholt <eric@anholt.net> +Date: Wed, 13 Apr 2016 13:05:03 -0700 +Subject: [PATCH 267/304] clk: bcm2835: Fix PLL poweron + +In poweroff, we set the reset bit and the power down bit, but only +managed to unset the reset bit for poweron. This meant that if HDMI +did -EPROBE_DEFER after it had grabbed its clocks, we'd power down the +PLLH (that had been on at boot time) and never recover. + +Signed-off-by: Eric Anholt <eric@anholt.net> +Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks") +Cc: stable@vger.kernel.org +Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> +(cherry picked from commit d794a7b18350b7538e64248adf639f2cb8da5fb7) +--- + drivers/clk/bcm/clk-bcm2835.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -557,6 +557,10 @@ static int bcm2835_pll_on(struct clk_hw + const struct bcm2835_pll_data *data = pll->data; + ktime_t timeout; + ++ cprman_write(cprman, data->a2w_ctrl_reg, ++ cprman_read(cprman, data->a2w_ctrl_reg) & ++ ~A2W_PLL_CTRL_PWRDN); ++ + /* Take the PLL out of reset. */ + cprman_write(cprman, data->cm_ctrl_reg, + cprman_read(cprman, data->cm_ctrl_reg) & ~CM_PLL_ANARST); |