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>
103 lines
3.1 KiB
Diff
103 lines
3.1 KiB
Diff
From b7c3fda0df5da90e87b037348c6d27f669c38388 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: Add claim-clocks property
|
|
|
|
The claim-clocks property can be used to prevent PLLs and dividers
|
|
from being marked as critical. It contains a vector of clock IDs,
|
|
as defined by dt-bindings/clock/bcm2835.h.
|
|
|
|
Use this mechanism to claim PLLD_DSI0, PLLD_DSI1, PLLH_AUX and
|
|
PLLH_PIX for the vc4_kms_v3d driver.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/clk/bcm/clk-bcm2835.c | 34 ++++++++++++++++++++++++++++++++--
|
|
1 file changed, 32 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
|
@@ -1311,6 +1311,8 @@ static const struct clk_ops bcm2835_vpu_
|
|
.debug_init = bcm2835_clock_debug_init,
|
|
};
|
|
|
|
+static bool bcm2835_clk_is_claimed(const char *name);
|
|
+
|
|
static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
|
|
const struct bcm2835_pll_data *data)
|
|
{
|
|
@@ -1327,6 +1329,9 @@ static struct clk_hw *bcm2835_register_p
|
|
init.ops = &bcm2835_pll_clk_ops;
|
|
init.flags = CLK_IGNORE_UNUSED;
|
|
|
|
+ if (!bcm2835_clk_is_claimed(data->name))
|
|
+ init.flags |= CLK_IS_CRITICAL;
|
|
+
|
|
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
|
|
if (!pll)
|
|
return NULL;
|
|
@@ -1382,8 +1387,10 @@ bcm2835_register_pll_divider(struct bcm2
|
|
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;
|
|
+ if (!bcm2835_clk_is_claimed(data->source_pll))
|
|
+ init.flags |= CLK_IS_CRITICAL;
|
|
+ if (!bcm2835_clk_is_claimed(data->name))
|
|
+ divider->div.flags |= CLK_IS_CRITICAL;
|
|
}
|
|
|
|
divider->cprman = cprman;
|
|
@@ -2191,6 +2198,8 @@ static const struct bcm2835_clk_desc clk
|
|
.ctl_reg = CM_PERIICTL),
|
|
};
|
|
|
|
+static bool bcm2835_clk_claimed[ARRAY_SIZE(clk_desc_array)];
|
|
+
|
|
/*
|
|
* Permanently take a reference on the parent of the SDRAM clock.
|
|
*
|
|
@@ -2210,6 +2219,19 @@ static int bcm2835_mark_sdc_parent_criti
|
|
return clk_prepare_enable(parent);
|
|
}
|
|
|
|
+static bool bcm2835_clk_is_claimed(const char *name)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) {
|
|
+ const char *clk_name = *(const char **)(clk_desc_array[i].data);
|
|
+ if (!strcmp(name, clk_name))
|
|
+ return bcm2835_clk_claimed[i];
|
|
+ }
|
|
+
|
|
+ return false;
|
|
+}
|
|
+
|
|
static int bcm2835_clk_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
@@ -2220,6 +2242,7 @@ static int bcm2835_clk_probe(struct plat
|
|
const size_t asize = ARRAY_SIZE(clk_desc_array);
|
|
const struct cprman_plat_data *pdata;
|
|
size_t i;
|
|
+ u32 clk_id;
|
|
int ret;
|
|
|
|
pdata = of_device_get_match_data(&pdev->dev);
|
|
@@ -2239,6 +2262,13 @@ static int bcm2835_clk_probe(struct plat
|
|
if (IS_ERR(cprman->regs))
|
|
return PTR_ERR(cprman->regs);
|
|
|
|
+ memset(bcm2835_clk_claimed, 0, sizeof(bcm2835_clk_claimed));
|
|
+ for (i = 0;
|
|
+ !of_property_read_u32_index(pdev->dev.of_node, "claim-clocks",
|
|
+ i, &clk_id);
|
|
+ i++)
|
|
+ bcm2835_clk_claimed[clk_id]= true;
|
|
+
|
|
memcpy(cprman->real_parent_names, cprman_parent_names,
|
|
sizeof(cprman_parent_names));
|
|
of_clk_parent_fill(dev->of_node, cprman->real_parent_names,
|