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>
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From fe4c14f1d934801361e9c9e2456f8250af2fffbd Mon Sep 17 00:00:00 2001
|
|
From: Martin Sperl <kernel@martin.sperl.org>
|
|
Date: Fri, 2 Sep 2016 16:45:27 +0100
|
|
Subject: [PATCH] Register the clocks early during the boot process, so
|
|
that special/critical clocks can get enabled early on in the boot process
|
|
avoiding the risk of disabling a clock, pll_divider or pll when a claiming
|
|
driver fails to install propperly - maybe it needs to defer.
|
|
|
|
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
|
|
---
|
|
drivers/clk/bcm/clk-bcm2835.c | 15 +++++++++++++--
|
|
1 file changed, 13 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
|
@@ -2267,8 +2267,15 @@ static int bcm2835_clk_probe(struct plat
|
|
if (ret)
|
|
return ret;
|
|
|
|
- return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
|
|
+ ret = of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
|
|
&cprman->onecell);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ /* note that we have registered all the clocks */
|
|
+ dev_dbg(dev, "registered %d clocks\n", asize);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static const struct cprman_plat_data cprman_bcm2835_plat_data = {
|
|
@@ -2294,7 +2301,11 @@ static struct platform_driver bcm2835_cl
|
|
.probe = bcm2835_clk_probe,
|
|
};
|
|
|
|
-builtin_platform_driver(bcm2835_clk_driver);
|
|
+static int __init __bcm2835_clk_driver_init(void)
|
|
+{
|
|
+ return platform_driver_register(&bcm2835_clk_driver);
|
|
+}
|
|
+core_initcall(__bcm2835_clk_driver_init);
|
|
|
|
MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
|
|
MODULE_DESCRIPTION("BCM2835 clock driver");
|