36aa27189a
Deleted upstream patches:
generic:
041-genirq-affinity-Make-affinity-setting-if-activated-o.patch
ipq806x:
093-5-v5.8-ipq806x-PCI-qcom-Define-some-PARF-params-needed-for-ipq8064-SoC.patch
093-6-v5.8-ipq806x-PCI-qcom-Add-support-for-tx-term-offset-for-rev-2_1_0.patch
Merged manually:
ipq806x:
093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch
layerscape:
804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
Build-tested: ath79/generic, ipq806x, layerscape/armv7, layerscape/armv8_64b
Run-tested: ipq806x (R7800)
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
|
|
@@ -2265,8 +2265,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 = {
|
|
@@ -2292,7 +2299,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");
|