mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
c6ddf8d502
Many changes were done in drivers/pinctrl/bcm/pinctrl-bcm2835.c between 5.4.171 and 5.4.179. The following 3 patches do not apply any more: * target/linux/bcm27xx/patches-5.4/950-0316-pinctrl-bcm2835-Add-support-for-BCM2711-pull-up-func.patch This was already integrated in kernel v5.4-rc1, it was never needed. * target/linux/bcm27xx/patches-5.4/950-0328-Revert-pinctrl-bcm2835-Pass-irqchip-when-adding-gpio.patch * target/linux/bcm27xx/patches-5.4/950-0362-pinctrl-bcm2835-Change-init-order-for-gpio-hogs.patch I think these were done to fix the problem which was really fixed in commit 75278f1aff5e ("pinctrl: bcm2835: Change init order for gpio hogs") from v5.4.175 target/linux/generic/backport-5.4/716-v5.5-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch Move fwnode_device_is_available to the same position as in kernel 5.10. target/linux/layerscape/patches-5.4/302-dts-0083-arm64-ls1028a-qds-correct-bus-of-rtc.patch Applied in commit 65816c1034769e714edb70f59a33bc5472d9e55f ("arm64: dts: ls1028a-qds: move rtc node to the correct i2c bus") Compile-tested: lantiq/xrx200, bcm27xx/bcm2710 Run-tested: lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 2c1a5dae2fb127729773685e3cd1e48934edf1f2 Mon Sep 17 00:00:00 2001
|
|
From: Luke Hinds <7058938+lukehinds@users.noreply.github.com>
|
|
Date: Wed, 22 Jan 2020 16:03:00 +0000
|
|
Subject: [PATCH] Initialise rpi-firmware before clk-bcm2835
|
|
|
|
The IMA (Integrity Measurement Architecture) looks for a TPM (Trusted
|
|
Platform Module) having been registered when it initialises; otherwise
|
|
it assumes there is no TPM. It has been observed on BCM2835 that IMA
|
|
is initialised before TPM, and that initialising the BCM2835 clock
|
|
driver before the firmware driver has the effect of reversing this
|
|
order.
|
|
|
|
Change the firmware driver to initialise at core_initcall, delaying the
|
|
BCM2835 clock driver to postcore_initcall.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/3291
|
|
https://github.com/raspberrypi/linux/pull/3297
|
|
|
|
Signed-off-by: Luke Hinds <lhinds@redhat.com>
|
|
Co-authored-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/clk/bcm/clk-bcm2835.c | 2 +-
|
|
drivers/firmware/raspberrypi.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
|
@@ -2396,7 +2396,7 @@ static int __init __bcm2835_clk_driver_i
|
|
{
|
|
return platform_driver_register(&bcm2835_clk_driver);
|
|
}
|
|
-core_initcall(__bcm2835_clk_driver_init);
|
|
+postcore_initcall(__bcm2835_clk_driver_init);
|
|
|
|
MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
|
|
MODULE_DESCRIPTION("BCM2835 clock driver");
|
|
--- a/drivers/firmware/raspberrypi.c
|
|
+++ b/drivers/firmware/raspberrypi.c
|
|
@@ -416,7 +416,7 @@ out2:
|
|
out1:
|
|
return ret;
|
|
}
|
|
-subsys_initcall(rpi_firmware_init);
|
|
+core_initcall(rpi_firmware_init);
|
|
|
|
static void __init rpi_firmware_exit(void)
|
|
{
|