aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-06-23 10:08:52 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-26 12:49:15 +0200
commite6bb0b6ad9c0c45c679501e13c0d5f3e2389d31f (patch)
treeb968bcd6eea432b9ac214f6259401f85fdf136a7 /target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
parent7ddee03808f3f56735bf2a14bfde59a13110a4b3 (diff)
downloadupstream-e6bb0b6ad9c0c45c679501e13c0d5f3e2389d31f.tar.gz
upstream-e6bb0b6ad9c0c45c679501e13c0d5f3e2389d31f.tar.bz2
upstream-e6bb0b6ad9c0c45c679501e13c0d5f3e2389d31f.zip
kernel: bump 5.4 to 5.4.128
Removed upstreamed: mvebu/patches-5.4/002-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.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/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch')
-rw-r--r--target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch b/target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
index bb9d7b7849..41fed6aded 100644
--- a/target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
+++ b/target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
@@ -31,7 +31,7 @@ Cc: <stable@vger.kernel.org> # 5.8+: ea17a0f153af: phy: marvell: comphy: Convert
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1123,7 +1123,9 @@ static int advk_pcie_enable_phy(struct a
+@@ -1154,7 +1154,9 @@ static int advk_pcie_enable_phy(struct a
}
ret = phy_power_on(pcie->phy);