b4c02c9998
Removed upstreamed patches: generic/pending-5.4 445-mtd-spinand-gigadevice-Only-one-dummy-byte-in-QUA.patch 446-mtd-spinand-gigadevice-Add-QE-Bit.patch pistachio/patches-5.4 150-pwm-img-Fix-null-pointer-access-in-probe.patch Manually rebased: layerscape/patches-5.4 801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch 801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch 801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, mvebu (mamba, rango), x86_64, ramips/mt7621 Run-tested: ipq806x/R7800, mvebu (mamba, rango), x86_64, ramips (RT-AC57U) No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [alter 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
29 lines
907 B
Diff
29 lines
907 B
Diff
From a50ed3cb374d57704b9a4706608b98d8c0ba3eb9 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Mon, 13 Feb 2017 17:20:08 +0000
|
|
Subject: [PATCH] clk-bcm2835: Mark used PLLs and dividers CRITICAL
|
|
|
|
The VPU configures and relies on several PLLs and dividers. Mark all
|
|
enabled dividers and their PLLs as CRITICAL to prevent the kernel from
|
|
switching them off.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/clk/bcm/clk-bcm2835.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
|
@@ -1381,6 +1381,11 @@ bcm2835_register_pll_divider(struct bcm2
|
|
divider->div.hw.init = &init;
|
|
divider->div.table = NULL;
|
|
|
|
+ if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) {
|
|
+ init.flags |= CLK_IS_CRITICAL;
|
|
+ divider->div.flags |= CLK_IS_CRITICAL;
|
|
+ }
|
|
+
|
|
divider->cprman = cprman;
|
|
divider->data = data;
|
|
|