diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-26 21:08:19 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-27 00:58:50 +0200 |
| commit | 85cef1cf221a4786fb8b1531748a5a0790101a3a (patch) | |
| tree | e3be71d7aa9f4dac3d72a6fa7aef5b265ca82a80 /target/linux/layerscape | |
| parent | e171d11f55e335416d2ee689604998698f517e00 (diff) | |
| download | upstream-85cef1cf221a4786fb8b1531748a5a0790101a3a.tar.gz upstream-85cef1cf221a4786fb8b1531748a5a0790101a3a.tar.bz2 upstream-85cef1cf221a4786fb8b1531748a5a0790101a3a.zip | |
kernel: bump 5.4 to 5.4.128
Manually rebased
bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
Replaced with patch from Raspberry Pi kernel 5.10 patches
mvebu/patches-5.4/002-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch
Applied upstream
All others updated automatically.
Compile-tested on: ath79/generic, lantiq/xrx200, brcm27xx
Runtime-tested on: ath79/generic, lantiq/xrx200
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape')
5 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/layerscape/patches-5.4/806-dma-0002-dmaengine-fsl-dpaa2-qdma-Add-NXP-dpaa2-qDMA-controll.patch b/target/linux/layerscape/patches-5.4/806-dma-0002-dmaengine-fsl-dpaa2-qdma-Add-NXP-dpaa2-qDMA-controll.patch index 897752d871..72d234d3ef 100644 --- a/target/linux/layerscape/patches-5.4/806-dma-0002-dmaengine-fsl-dpaa2-qdma-Add-NXP-dpaa2-qDMA-controll.patch +++ b/target/linux/layerscape/patches-5.4/806-dma-0002-dmaengine-fsl-dpaa2-qdma-Add-NXP-dpaa2-qDMA-controll.patch @@ -38,7 +38,7 @@ Signed-off-by: Peng Ma <peng.ma@nxp.com> --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig -@@ -669,6 +669,8 @@ source "drivers/dma/sh/Kconfig" +@@ -670,6 +670,8 @@ source "drivers/dma/sh/Kconfig" source "drivers/dma/ti/Kconfig" diff --git a/target/linux/layerscape/patches-5.4/806-dma-0003-MLK-14610-DMA-fsl-edma-v3-add-fsl-edma-v3-support.patch b/target/linux/layerscape/patches-5.4/806-dma-0003-MLK-14610-DMA-fsl-edma-v3-add-fsl-edma-v3-support.patch index 1744d37419..780d3c89e2 100644 --- a/target/linux/layerscape/patches-5.4/806-dma-0003-MLK-14610-DMA-fsl-edma-v3-add-fsl-edma-v3-support.patch +++ b/target/linux/layerscape/patches-5.4/806-dma-0003-MLK-14610-DMA-fsl-edma-v3-add-fsl-edma-v3-support.patch @@ -85,7 +85,7 @@ Signed-off-by: Robin Gong <yibin.gong@nxp.com> +}; --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig -@@ -227,6 +227,17 @@ config FSL_QDMA +@@ -228,6 +228,17 @@ config FSL_QDMA or dequeuing DMA jobs from, different work queues. This module can be found on NXP Layerscape SoCs. The qdma driver only work on SoCs with a DPAA hardware block. diff --git a/target/linux/layerscape/patches-5.4/806-dma-0026-dma-caam-add-dma-memcpy-driver.patch b/target/linux/layerscape/patches-5.4/806-dma-0026-dma-caam-add-dma-memcpy-driver.patch index 073842eb13..be5ae1ad13 100644 --- a/target/linux/layerscape/patches-5.4/806-dma-0026-dma-caam-add-dma-memcpy-driver.patch +++ b/target/linux/layerscape/patches-5.4/806-dma-0026-dma-caam-add-dma-memcpy-driver.patch @@ -28,7 +28,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig -@@ -131,6 +131,24 @@ config COH901318 +@@ -132,6 +132,24 @@ config COH901318 help Enable support for ST-Ericsson COH 901 318 DMA. @@ -53,7 +53,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> config DMA_BCM2835 tristate "BCM2835 DMA engine support" depends on ARCH_BCM2835 -@@ -662,7 +680,6 @@ config ZX_DMA +@@ -663,7 +681,6 @@ config ZX_DMA help Support the DMA engine for ZTE ZX family platform devices. diff --git a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch index e3d18a9948..ccefbffd48 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch @@ -54,7 +54,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com> * All 3.1 IP version constants are greater than the 3.0 IP --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -3575,6 +3575,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3578,6 +3578,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) dwc->gadget.sg_supported = true; dwc->gadget.name = "dwc3-gadget"; dwc->gadget.lpm_capable = true; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch b/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch index ff582f3ace..e444af408a 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch @@ -20,7 +20,7 @@ Signed-off-by: Li Jun <jun.li@freescale.com> --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -4729,7 +4729,8 @@ hub_port_init(struct usb_hub *hub, struc +@@ -4731,7 +4731,8 @@ hub_port_init(struct usb_hub *hub, struc } if (r) { if (r != -ENODEV) |