aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-05-09 18:18:20 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-05-18 00:10:34 +0200
commite0bdf839722659ded1ce2f827f04ec4d9be3c6fc (patch)
treeda9d261db6cbc5d4a5fac5d93da6978880807b2c /target/linux/mvebu
parentb4ea8e1089b6db4367d9bd40654d7b16590ae19f (diff)
downloadupstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.gz
upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.bz2
upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.zip
kernel: bump 5.4 to 5.4.191
Merged upstream: apm821xx/patches-5.4/150-ata-sata_dwc_460ex-Fix-crash-due-to-OOB-write.patch Similar patch merged upstream: bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch Manually adapted: layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch Compile-tested: armvirt/64 Run-tested: armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu')
-rw-r--r--target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch4
-rw-r--r--target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch2
2 files changed, 3 insertions, 3 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 3d88a9e417..525d9ec794 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);
-@@ -1495,6 +1504,62 @@ out_release_res:
+@@ -1493,6 +1502,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;
-@@ -1627,6 +1692,10 @@ static int advk_pcie_probe(struct platfo
+@@ -1625,6 +1690,10 @@ static int advk_pcie_probe(struct platfo
else
pcie->link_gen = ret;
diff --git a/target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch b/target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
index cab99ce4ce..5a6173a666 100644
--- a/target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
+++ b/target/linux/mvebu/patches-5.4/026-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
-@@ -1528,7 +1528,9 @@ static int advk_pcie_enable_phy(struct a
+@@ -1526,7 +1526,9 @@ static int advk_pcie_enable_phy(struct a
}
ret = phy_power_on(pcie->phy);