diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-19 13:25:42 +0200 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-20 14:19:39 +0200 |
commit | 83b1e40561d2e243b757bb5608b0feeb839fe1fa (patch) | |
tree | da7cc783b54b0b0b9dfa7591ece03535a7e0533a /target/linux/bcm27xx | |
parent | cf7c101135934710b1958092da9a0c9ad446de4b (diff) | |
download | upstream-83b1e40561d2e243b757bb5608b0feeb839fe1fa.tar.gz upstream-83b1e40561d2e243b757bb5608b0feeb839fe1fa.tar.bz2 upstream-83b1e40561d2e243b757bb5608b0feeb839fe1fa.zip |
kernel: bump 5.4 to 5.4.59
Removed since added upstream:
bcm27xx:
950-0428-staging-vchiq_arm-Add-a-matching-unregister-call.patch
lantiq:
0800-spi-lantiq-ssc-Fix-warning-by-using-WQ_MEM_RECLAI.patch
Manually adjusted patches:
layerscape:
801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch
Build-tested: ath79/generic, ramips, lantiq/xrx200, lantiq/xway,
mvebu/cortexa9, sunxi/a53
Run-tested: ipq806x (R7800), layerscape (LS1012A-FRDM, LS1046A-RDB)
Building on layerscape is only possible with workaround from PR #3179.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-By: John Audia <graysky@archlinux.us> [ipq806x]
Tested-by: Pawel Dembicki <paweldembicki@gmail.com> [layerscape]
Diffstat (limited to 'target/linux/bcm27xx')
7 files changed, 9 insertions, 34 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0011-spi-spidev-Completely-disable-the-spidev-warning.patch b/target/linux/bcm27xx/patches-5.4/950-0011-spi-spidev-Completely-disable-the-spidev-warning.patch index 7419136f8a..0284c9b05f 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0011-spi-spidev-Completely-disable-the-spidev-warning.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0011-spi-spidev-Completely-disable-the-spidev-warning.patch @@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -729,7 +729,7 @@ static int spidev_probe(struct spi_devic +@@ -734,7 +734,7 @@ static int spidev_probe(struct spi_devic * compatible string, it is a Linux implementation thing * rather than a description of the hardware. */ diff --git a/target/linux/bcm27xx/patches-5.4/950-0049-Add-cpufreq-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0049-Add-cpufreq-driver.patch index 655018a4fa..3fa7e3d8eb 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0049-Add-cpufreq-driver.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0049-Add-cpufreq-driver.patch @@ -18,7 +18,7 @@ Signed-off-by: Dom Cobley <dom@raspberrypi.com> --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm -@@ -300,6 +300,15 @@ config ARM_TANGO_CPUFREQ +@@ -301,6 +301,15 @@ config ARM_TANGO_CPUFREQ depends on CPUFREQ_DT && ARCH_TANGO default y diff --git a/target/linux/bcm27xx/patches-5.4/950-0335-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch b/target/linux/bcm27xx/patches-5.4/950-0335-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch index 7521434038..cf8d563c72 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0335-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0335-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch @@ -30,9 +30,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); -@@ -3265,6 +3267,7 @@ failed_platform_init: - static int vchiq_remove(struct platform_device *pdev) +@@ -3266,6 +3268,7 @@ static int vchiq_remove(struct platform_ { + platform_device_unregister(bcm2835_audio); platform_device_unregister(bcm2835_camera); + platform_device_unregister(vcsm_cma); vchiq_debugfs_deinit(); diff --git a/target/linux/bcm27xx/patches-5.4/950-0336-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch b/target/linux/bcm27xx/patches-5.4/950-0336-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch index 499efe2b65..9e1b777cac 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0336-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0336-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch @@ -30,9 +30,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); -@@ -3267,6 +3269,7 @@ failed_platform_init: - static int vchiq_remove(struct platform_device *pdev) +@@ -3268,6 +3270,7 @@ static int vchiq_remove(struct platform_ { + platform_device_unregister(bcm2835_audio); platform_device_unregister(bcm2835_camera); + platform_device_unregister(bcm2835_codec); platform_device_unregister(vcsm_cma); diff --git a/target/linux/bcm27xx/patches-5.4/950-0428-staging-vchiq_arm-Add-a-matching-unregister-call.patch b/target/linux/bcm27xx/patches-5.4/950-0428-staging-vchiq_arm-Add-a-matching-unregister-call.patch deleted file mode 100644 index 8271b2505a..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0428-staging-vchiq_arm-Add-a-matching-unregister-call.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 79a2c3013a3b2a4304f953a4a55c49c1bc85202b Mon Sep 17 00:00:00 2001 -From: Phil Elwell <phil@raspberrypi.com> -Date: Mon, 3 Feb 2020 17:33:01 +0000 -Subject: [PATCH] staging: vchiq_arm: Add a matching unregister call - -All the registered children of vchiq have a corresponding call to -platform_device_unregister except bcm2835_audio. Fix that. - -Fixes: 25c7597af20d ("staging: vchiq_arm: Register a platform device for audio") - -Signed-off-by: Phil Elwell <phil@raspberrypi.com> ---- - drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -3293,6 +3293,7 @@ failed_platform_init: - - static int vchiq_remove(struct platform_device *pdev) - { -+ platform_device_unregister(bcm2835_audio); - platform_device_unregister(bcm2835_camera); - platform_device_unregister(bcm2835_codec); - platform_device_unregister(vcsm_cma); diff --git a/target/linux/bcm27xx/patches-5.4/950-0447-PCI-of-Add-inbound-resource-parsing-to-helpers.patch b/target/linux/bcm27xx/patches-5.4/950-0447-PCI-of-Add-inbound-resource-parsing-to-helpers.patch index 6bdd9d2dcf..d7bc3d709d 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0447-PCI-of-Add-inbound-resource-parsing-to-helpers.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0447-PCI-of-Add-inbound-resource-parsing-to-helpers.patch @@ -174,7 +174,7 @@ Cc: linux-rockchip@lists.infradead.org return ret; --- a/drivers/pci/controller/pcie-cadence-host.c +++ b/drivers/pci/controller/pcie-cadence-host.c -@@ -211,7 +211,7 @@ static int cdns_pcie_host_init(struct de +@@ -216,7 +216,7 @@ static int cdns_pcie_host_init(struct de int err; /* Parse our PCI ranges and request their resources */ diff --git a/target/linux/bcm27xx/patches-5.4/950-0671-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch b/target/linux/bcm27xx/patches-5.4/950-0671-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch index fa01cd8532..00bbe98117 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0671-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0671-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch @@ -11,7 +11,7 @@ This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28. --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -394,7 +394,6 @@ spidev_ioctl(struct file *filp, unsigned +@@ -399,7 +399,6 @@ spidev_ioctl(struct file *filp, unsigned else retval = get_user(tmp, (u32 __user *)arg); if (retval == 0) { @@ -19,7 +19,7 @@ This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28. u32 save = spi->mode; if (tmp & ~SPI_MODE_MASK) { -@@ -402,10 +401,6 @@ spidev_ioctl(struct file *filp, unsigned +@@ -407,10 +406,6 @@ spidev_ioctl(struct file *filp, unsigned break; } |