diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
commit | f7ba01a9677fffa21535bc6cdcad930a858d6106 (patch) | |
tree | 6eb6df39221f8926b813d63b41ffed9da18e6a5d /0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch | |
parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
download | kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.gz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.xz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.zip |
merge masterkernel-5.7.0-0.rc3.1.vanilla.1.fc33kernel-5.7.0-0.rc3.1.vanilla.1.fc32kernel-5.7.0-0.rc3.1.vanilla.1.fc31kernel-5.7.0-0.rc3.1.vanilla.1.fc30
Diffstat (limited to '0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch')
-rw-r--r-- | 0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch b/0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch index 76bd6fb1f..3aa40bb51 100644 --- a/0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch +++ b/0001-PCI-brcmstb-Wait-for-Raspberry-Pi-s-firmware-when-pr.patch @@ -1,4 +1,4 @@ -From 44c851258128353245193308b9c14793fb055a63 Mon Sep 17 00:00:00 2001 +From 23ef7f759a9778402eeeb95924eb300cb1f88bd2 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Date: Tue, 10 Mar 2020 13:52:41 +0100 Subject: [PATCH] PCI: brcmstb: Wait for Raspberry Pi's firmware when present @@ -21,11 +21,11 @@ index 6d79d14527a6..aee84679a997 100644 @@ -28,6 +28,8 @@ #include <linux/string.h> #include <linux/types.h> - + +#include <soc/bcm2835/raspberrypi-firmware.h> + #include "../pci.h" - + /* BRCM_PCIE_CAP_REGS - Offset for the mandatory capability config regs */ @@ -917,11 +919,24 @@ static int brcm_pcie_probe(struct platform_device *pdev) { @@ -36,7 +36,7 @@ index 6d79d14527a6..aee84679a997 100644 struct pci_bus *child; struct resource *res; int ret; - + + /* + * We have to wait for the Raspberry Pi's firmware interface to be up + * as some PCI fixups depend on it. @@ -53,5 +53,5 @@ index 6d79d14527a6..aee84679a997 100644 if (!bridge) return -ENOMEM; -- -2.26.0 +2.26.2 |