aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-06-26 21:08:19 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-27 00:58:50 +0200
commit85cef1cf221a4786fb8b1531748a5a0790101a3a (patch)
treee3be71d7aa9f4dac3d72a6fa7aef5b265ca82a80 /target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch
parente171d11f55e335416d2ee689604998698f517e00 (diff)
downloadupstream-85cef1cf221a4786fb8b1531748a5a0790101a3a.tar.gz
upstream-85cef1cf221a4786fb8b1531748a5a0790101a3a.tar.bz2
upstream-85cef1cf221a4786fb8b1531748a5a0790101a3a.zip
kernel: bump 5.4 to 5.4.128
Manually rebased bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch Replaced with patch from Raspberry Pi kernel 5.10 patches mvebu/patches-5.4/002-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch Applied upstream All others updated automatically. Compile-tested on: ath79/generic, lantiq/xrx200, brcm27xx Runtime-tested on: ath79/generic, lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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;