diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-04-10 12:42:32 +0100 |
|---|---|---|
| committer | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-08-16 22:38:31 +0100 |
| commit | 7d139bd5f37cda7f081174a0e5afc53988a37029 (patch) | |
| tree | 34cd4523787153b2497b978aa68ee67879db3e73 /target/linux/mvebu/patches-5.15/801-pci-mvebu-time-out-reset-on-link-up.patch | |
| parent | fb29b91c5b9baff24bfa5146c2649d8dd5e01af3 (diff) | |
| download | upstream-7d139bd5f37cda7f081174a0e5afc53988a37029.tar.gz upstream-7d139bd5f37cda7f081174a0e5afc53988a37029.tar.bz2 upstream-7d139bd5f37cda7f081174a0e5afc53988a37029.zip | |
mvebu: refresh 5.15 patches
Deleted (upstreamed):
303-linksys_hardcode_nand_ecc_settings.patch [1]
Deleted (not needed):
314-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch [2]
Manually rebased:
700-mvneta-tx-queue-workaround.patch
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4daff3e5b42422cd4af758cc7768223d2b7f6e14
[2] https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=7f73acade0cde61341cb77e0dc74de51ac059d4f
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/mvebu/patches-5.15/801-pci-mvebu-time-out-reset-on-link-up.patch')
| -rw-r--r-- | target/linux/mvebu/patches-5.15/801-pci-mvebu-time-out-reset-on-link-up.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-5.15/801-pci-mvebu-time-out-reset-on-link-up.patch b/target/linux/mvebu/patches-5.15/801-pci-mvebu-time-out-reset-on-link-up.patch index a5e49552e9..dba1253699 100644 --- a/target/linux/mvebu/patches-5.15/801-pci-mvebu-time-out-reset-on-link-up.patch +++ b/target/linux/mvebu/patches-5.15/801-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 -@@ -941,6 +941,7 @@ static int mvebu_pcie_powerup(struct mve +@@ -1023,6 +1023,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); -@@ -948,7 +949,13 @@ static int mvebu_pcie_powerup(struct mve +@@ -1030,7 +1031,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; -@@ -1108,15 +1115,16 @@ static int mvebu_pcie_probe(struct platf +@@ -1190,15 +1197,16 @@ static int mvebu_pcie_probe(struct platf if (!child) continue; |