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/bcm27xx/patches-5.4/950-0042-dmaengine-Add-support-for-BCM2708.patch | |
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/bcm27xx/patches-5.4/950-0042-dmaengine-Add-support-for-BCM2708.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0042-dmaengine-Add-support-for-BCM2708.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0042-dmaengine-Add-support-for-BCM2708.patch b/target/linux/bcm27xx/patches-5.4/950-0042-dmaengine-Add-support-for-BCM2708.patch index 496c3aae07..f66a4f251a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0042-dmaengine-Add-support-for-BCM2708.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0042-dmaengine-Add-support-for-BCM2708.patch @@ -178,7 +178,7 @@ Signed-off-by: Andrei Gherzan <andrei@gherzan.com> --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig -@@ -133,7 +133,7 @@ config COH901318 +@@ -134,7 +134,7 @@ config COH901318 config DMA_BCM2835 tristate "BCM2835 DMA engine support" @@ -187,7 +187,7 @@ Signed-off-by: Andrei Gherzan <andrei@gherzan.com> select DMA_ENGINE select DMA_VIRTUAL_CHANNELS -@@ -608,6 +608,10 @@ config UNIPHIER_MDMAC +@@ -609,6 +609,10 @@ config UNIPHIER_MDMAC UniPhier platform. This DMA controller is used as the external DMA engine of the SD/eMMC controllers of the LD4, Pro4, sLD8 SoCs. |