mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
eb73efcd3f
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Co-authored-by: Rui Salvaterra <rsalvaterra@gmail.com>
29 lines
915 B
Diff
29 lines
915 B
Diff
From 3af9c4ed5775b7675e679a80a381eafe2ce726ae 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
|
|
@@ -1379,6 +1379,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 = divider_data;
|
|
|