aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/401-pci-mvebu-time-out-reset-on-link-up.patch
diff options
context:
space:
mode:
authorDENG Qingfang <dengqf6@mail2.sysu.edu.cn>2020-03-04 20:46:28 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2020-04-13 22:41:37 +0200
commitd13fe4127cc4dd22cd34e4bd0afb6d0cd7add157 (patch)
treeeb56f4df00a149545a37dd7404853dee47256173 /target/linux/mvebu/patches-5.4/401-pci-mvebu-time-out-reset-on-link-up.patch
parentae183c128fdd41a041b760f11bf2ba8c0b8a42eb (diff)
downloadupstream-d13fe4127cc4dd22cd34e4bd0afb6d0cd7add157.tar.gz
upstream-d13fe4127cc4dd22cd34e4bd0afb6d0cd7add157.tar.bz2
upstream-d13fe4127cc4dd22cd34e4bd0afb6d0cd7add157.zip
mvebu: refresh patches
Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/401-pci-mvebu-time-out-reset-on-link-up.patch')
-rw-r--r--target/linux/mvebu/patches-5.4/401-pci-mvebu-time-out-reset-on-link-up.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-5.4/401-pci-mvebu-time-out-reset-on-link-up.patch b/target/linux/mvebu/patches-5.4/401-pci-mvebu-time-out-reset-on-link-up.patch
index 2bbb647153..4058dc8ed5 100644
--- a/target/linux/mvebu/patches-5.4/401-pci-mvebu-time-out-reset-on-link-up.patch
+++ b/target/linux/mvebu/patches-5.4/401-pci-mvebu-time-out-reset-on-link-up.patch
@@ -13,7 +13,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
-@@ -1112,6 +1112,7 @@ static int mvebu_pcie_powerup(struct mve
+@@ -928,6 +928,7 @@ static int mvebu_pcie_powerup(struct mve
if (port->reset_gpio) {
u32 reset_udelay = PCI_PM_D3COLD_WAIT * 1000;
@@ -21,7 +21,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
of_property_read_u32(port->dn, "reset-delay-us",
&reset_udelay);
-@@ -1119,7 +1120,13 @@ static int mvebu_pcie_powerup(struct mve
+@@ -935,7 +936,13 @@ static int mvebu_pcie_powerup(struct mve
udelay(100);
gpiod_set_value_cansleep(port->reset_gpio, 0);
@@ -36,7 +36,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
return 0;
-@@ -1283,15 +1290,16 @@ static int mvebu_pcie_probe(struct platf
+@@ -1099,15 +1106,16 @@ static int mvebu_pcie_probe(struct platf
if (!child)
continue;