diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-19 20:43:37 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-19 20:43:37 +0100 |
commit | a1bca844951d5e3e249c7d23620855b829807184 (patch) | |
tree | de56360dd8e9cbdfbc26f3bad26188170fc5ec6f | |
parent | c0d7ca379c1745ec6dc4892e46e3f97d0ae76d8d (diff) | |
parent | 4204abb15500633c62a22c08e4c1141bcd10754d (diff) | |
download | kernel-a1bca844951d5e3e249c7d23620855b829807184.tar.gz kernel-a1bca844951d5e3e249c7d23620855b829807184.tar.xz kernel-a1bca844951d5e3e249c7d23620855b829807184.zip |
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
-rw-r--r-- | 0001-brcm-rpi4-fix-usb-numeration.patch | 25 | ||||
-rw-r--r-- | kernel.spec | 6 |
2 files changed, 31 insertions, 0 deletions
diff --git a/0001-brcm-rpi4-fix-usb-numeration.patch b/0001-brcm-rpi4-fix-usb-numeration.patch new file mode 100644 index 000000000..810d78d35 --- /dev/null +++ b/0001-brcm-rpi4-fix-usb-numeration.patch @@ -0,0 +1,25 @@ +From 6e318871fac5533bd4dd82677b08ba7be17df55b Mon Sep 17 00:00:00 2001 +From: Peter Robinson <pbrobinson@gmail.com> +Date: Tue, 12 Jan 2021 23:14:09 +0000 +Subject: [PATCH] brcm: rpi4: fix usb numeration + +Signed-off-by: Peter Robinson <pbrobinson@gmail.com> +--- + drivers/pci/controller/pcie-brcmstb.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c +index 9c3d2982248d..78ed98e9b099 100644 +--- a/drivers/pci/controller/pcie-brcmstb.c ++++ b/drivers/pci/controller/pcie-brcmstb.c +@@ -869,6 +869,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) + + /* Reset the bridge */ + pcie->bridge_sw_init_set(pcie, 1); ++ pcie->perst_set(pcie, 1); + usleep_range(100, 200); + + /* Take the bridge out of reset */ +-- +2.29.2 + diff --git a/kernel.spec b/kernel.spec index 32513cf8c..2fa0fb304 100644 --- a/kernel.spec +++ b/kernel.spec @@ -864,6 +864,9 @@ Patch102: 0001-update-phy-on-pine64-a64-devices.patch # OMAP Pandaboard fix Patch103: arm-pandaboard-fix-add-bluetooth.patch +# Fix for USB on some newer RPi4 / firmware combinations +Patch104: 0001-brcm-rpi4-fix-usb-numeration.patch + # Nouveau mDP detection fix Patch107: 0001-drm-nouveau-kms-handle-mDP-connectors.patch @@ -2983,6 +2986,9 @@ fi # # %changelog +* Sun Jan 17 13:09:31 CST 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.8-200 +- Linux v5.10.8 + * Tue Jan 12 13:41:35 CST 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.7-200 - Linux v5.10.7 |