aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-10-31 07:35:12 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-11-01 14:44:06 +0100
commitb4c02c999894d9af49ba124c1be0079ffb5141f0 (patch)
tree0f7563c3bcc0084989180aa8b0a9e8f0c06689e1 /target/linux/mvebu/patches-5.4
parent5cdc65f6d1f44ab506e67aa266a095c8706f34a7 (diff)
downloadupstream-b4c02c999894d9af49ba124c1be0079ffb5141f0.tar.gz
upstream-b4c02c999894d9af49ba124c1be0079ffb5141f0.tar.bz2
upstream-b4c02c999894d9af49ba124c1be0079ffb5141f0.zip
kernel: bump 5.4 to 5.4.73
Removed upstreamed patches: generic/pending-5.4 445-mtd-spinand-gigadevice-Only-one-dummy-byte-in-QUA.patch 446-mtd-spinand-gigadevice-Add-QE-Bit.patch pistachio/patches-5.4 150-pwm-img-Fix-null-pointer-access-in-probe.patch Manually rebased: layerscape/patches-5.4 801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch 801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch 801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, mvebu (mamba, rango), x86_64, ramips/mt7621 Run-tested: ipq806x/R7800, mvebu (mamba, rango), x86_64, ramips (RT-AC57U) No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [alter 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/mvebu/patches-5.4')
-rw-r--r--target/linux/mvebu/patches-5.4/405-PCI-aardvark-Improve-link-training.patch4
-rw-r--r--target/linux/mvebu/patches-5.4/406-PCI-aardvark-Issue-PERST-via-GPIO.patch2
-rw-r--r--target/linux/mvebu/patches-5.4/407-PCI-aardvark-Add-PHY-support.patch6
-rw-r--r--target/linux/mvebu/patches-5.4/408-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch2
-rw-r--r--target/linux/mvebu/patches-5.4/410-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch2
5 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/mvebu/patches-5.4/405-PCI-aardvark-Improve-link-training.patch b/target/linux/mvebu/patches-5.4/405-PCI-aardvark-Improve-link-training.patch
index 20723894ec..2bf838432f 100644
--- a/target/linux/mvebu/patches-5.4/405-PCI-aardvark-Improve-link-training.patch
+++ b/target/linux/mvebu/patches-5.4/405-PCI-aardvark-Improve-link-training.patch
@@ -193,7 +193,7 @@ Acked-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
reg = advk_readl(pcie, PCIE_CORE_CMD_STATUS_REG);
reg |= PCIE_CORE_CMD_MEM_ACCESS_EN |
-@@ -1036,6 +1094,12 @@ static int advk_pcie_probe(struct platfo
+@@ -1035,6 +1093,12 @@ static int advk_pcie_probe(struct platfo
return ret;
}
@@ -205,4 +205,4 @@ Acked-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+
advk_pcie_setup_hw(pcie);
- advk_sw_pci_bridge_init(pcie);
+ ret = advk_sw_pci_bridge_init(pcie);
diff --git a/target/linux/mvebu/patches-5.4/406-PCI-aardvark-Issue-PERST-via-GPIO.patch b/target/linux/mvebu/patches-5.4/406-PCI-aardvark-Issue-PERST-via-GPIO.patch
index 1ba70dd6f7..83212ec475 100644
--- a/target/linux/mvebu/patches-5.4/406-PCI-aardvark-Issue-PERST-via-GPIO.patch
+++ b/target/linux/mvebu/patches-5.4/406-PCI-aardvark-Issue-PERST-via-GPIO.patch
@@ -98,7 +98,7 @@ Acked-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* fundamental reset. As required by PCI Express spec a delay for at
* least 100ms after such a reset before link training is needed.
*/
-@@ -1094,6 +1119,22 @@ static int advk_pcie_probe(struct platfo
+@@ -1093,6 +1118,22 @@ static int advk_pcie_probe(struct platfo
return ret;
}
diff --git a/target/linux/mvebu/patches-5.4/407-PCI-aardvark-Add-PHY-support.patch b/target/linux/mvebu/patches-5.4/407-PCI-aardvark-Add-PHY-support.patch
index 1d9a9cbb1c..fa04861e80 100644
--- a/target/linux/mvebu/patches-5.4/407-PCI-aardvark-Add-PHY-support.patch
+++ b/target/linux/mvebu/patches-5.4/407-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);
-@@ -1084,6 +1093,62 @@ out_release_res:
+@@ -1083,6 +1092,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;
-@@ -1141,6 +1206,10 @@ static int advk_pcie_probe(struct platfo
+@@ -1140,6 +1205,10 @@ static int advk_pcie_probe(struct platfo
else
pcie->link_gen = ret;
@@ -149,4 +149,4 @@ Cc: Miquèl Raynal <miquel.raynal@bootlin.com>
+
advk_pcie_setup_hw(pcie);
- advk_sw_pci_bridge_init(pcie);
+ ret = advk_sw_pci_bridge_init(pcie);
diff --git a/target/linux/mvebu/patches-5.4/408-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch b/target/linux/mvebu/patches-5.4/408-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch
index 9bff37b27a..dfc068c8cb 100644
--- a/target/linux/mvebu/patches-5.4/408-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch
+++ b/target/linux/mvebu/patches-5.4/408-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch
@@ -34,7 +34,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -640,6 +640,13 @@ static bool advk_pcie_valid_device(struc
+@@ -639,6 +639,13 @@ static bool advk_pcie_valid_device(struc
if ((bus->number == pcie->root_bus_nr) && PCI_SLOT(devfn) != 0)
return false;
diff --git a/target/linux/mvebu/patches-5.4/410-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch b/target/linux/mvebu/patches-5.4/410-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
index 510b7458a5..bb9d7b7849 100644
--- a/target/linux/mvebu/patches-5.4/410-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
+++ b/target/linux/mvebu/patches-5.4/410-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
@@ -31,7 +31,7 @@ Cc: <stable@vger.kernel.org> # 5.8+: ea17a0f153af: phy: marvell: comphy: Convert
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1124,7 +1124,9 @@ static int advk_pcie_enable_phy(struct a
+@@ -1123,7 +1123,9 @@ static int advk_pcie_enable_phy(struct a
}
ret = phy_power_on(pcie->phy);