diff options
author | John Audia <graysky@archlinux.us> | 2021-05-11 11:50:27 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-23 15:09:06 +0200 |
commit | 3e1c92f9e1be108df2042ab211cc8d68938e6af9 (patch) | |
tree | 4c584e34aca05f31dec4141b7d446dc283f9c36c /target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch | |
parent | f726b37b681866145701bd1324c9c654312fa779 (diff) | |
download | upstream-3e1c92f9e1be108df2042ab211cc8d68938e6af9.tar.gz upstream-3e1c92f9e1be108df2042ab211cc8d68938e6af9.tar.bz2 upstream-3e1c92f9e1be108df2042ab211cc8d68938e6af9.zip |
kernel: bump 5.4 to 5.4.118
Manually rebased:
ath79/patches-5.4/0033-spi-ath79-drop-pdata-support.patch
Removed uneeded patch:
ath79/patches-5.4/0050-spi-ath79-remove-spi-master-setup-and-cleanup-assign.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch')
-rw-r--r-- | target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch b/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch index e92393ff6f..0c7830cb47 100644 --- a/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch +++ b/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch @@ -47,7 +47,7 @@ Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> status = "disabled"; --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi -@@ -493,6 +493,7 @@ +@@ -494,6 +494,7 @@ <0 0 0 2 &pcie_intc 1>, <0 0 0 3 &pcie_intc 2>, <0 0 0 4 &pcie_intc 3>; |