aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.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/019-PCI-aardvark-Add-PHY-support.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/019-PCI-aardvark-Add-PHY-support.patch')
-rw-r--r--target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch b/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch
index fa04861e80..640e4eb57c 100644
--- a/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch
+++ b/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch
@@ -76,7 +76,7 @@ Cc: Miquèl Raynal <miquel.raynal@bootlin.com>
/* Set to Direct mode */
reg = advk_readl(pcie, CTRL_CONFIG_REG);
reg &= ~(CTRL_MODE_MASK << CTRL_MODE_SHIFT);
-@@ -1083,6 +1092,62 @@ out_release_res:
+@@ -1114,6 +1123,62 @@ out_release_res:
return err;
}
@@ -139,7 +139,7 @@ Cc: Miquèl Raynal <miquel.raynal@bootlin.com>
static int advk_pcie_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
-@@ -1140,6 +1205,10 @@ static int advk_pcie_probe(struct platfo
+@@ -1171,6 +1236,10 @@ static int advk_pcie_probe(struct platfo
else
pcie->link_gen = ret;