diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 15:28:55 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 16:45:56 +0200 |
| commit | 50f456b46cbae27ed13badfe7b2976cd01b67a57 (patch) | |
| tree | 9911069e0538585942fe2c16685e7ed3afbff674 /target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch | |
| parent | 78cf3e53b1f4ea6428925302d78f743a693d5fb1 (diff) | |
| download | upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.tar.gz upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.tar.bz2 upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.zip | |
kernel: bump 5.4 to 5.4.150
Manually rebased:
generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
Removed upstreamed:
layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch
All others updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch')
| -rw-r--r-- | target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch b/target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch index 3ff0dcb166..d1bfd70d30 100644 --- a/target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch +++ b/target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch @@ -29,7 +29,7 @@ Acked-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c -@@ -311,11 +311,6 @@ static void advk_pcie_setup_hw(struct ad +@@ -315,11 +315,6 @@ static void advk_pcie_setup_hw(struct ad reg |= LANE_COUNT_1; advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG); @@ -41,7 +41,7 @@ Acked-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> /* Enable MSI */ reg = advk_readl(pcie, PCIE_CORE_CTRL2_REG); reg |= PCIE_CORE_CTRL2_MSI_ENABLE; -@@ -357,7 +352,15 @@ static void advk_pcie_setup_hw(struct ad +@@ -361,7 +356,15 @@ static void advk_pcie_setup_hw(struct ad */ msleep(PCI_PM_D3COLD_WAIT); |