diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-07-09 20:32:28 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-07-14 12:44:14 +0200 |
commit | 42954857190b9df16d9d873ecc7f6cc38e013e44 (patch) | |
tree | 98c588f629ff534d458eb0884782ea99672d7634 /target/linux/brcm2708/patches-4.19/950-0289-Revert-staging-vchiq_arm-Register-a-platform-device-.patch | |
parent | f1875e902d0afb7d9b9e5285b4fd8da7f6c5e30a (diff) | |
download | upstream-42954857190b9df16d9d873ecc7f6cc38e013e44.tar.gz upstream-42954857190b9df16d9d873ecc7f6cc38e013e44.tar.bz2 upstream-42954857190b9df16d9d873ecc7f6cc38e013e44.zip |
brcm2708: add linux 4.19 support
Boot tested on Raspberry Pi B+ (BCM2708) and Raspberry Pi 2 (BCM2709)
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0289-Revert-staging-vchiq_arm-Register-a-platform-device-.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0289-Revert-staging-vchiq_arm-Register-a-platform-device-.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0289-Revert-staging-vchiq_arm-Register-a-platform-device-.patch b/target/linux/brcm2708/patches-4.19/950-0289-Revert-staging-vchiq_arm-Register-a-platform-device-.patch new file mode 100644 index 0000000000..d428773a1b --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0289-Revert-staging-vchiq_arm-Register-a-platform-device-.patch @@ -0,0 +1,48 @@ +From f70b874a07779f015befed503790417c6bc1cfd2 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.org> +Date: Tue, 4 Dec 2018 19:40:12 +0000 +Subject: [PATCH 289/703] Revert "staging: vchiq_arm: Register a platform + device for the audio driver" + +This reverts commit ab59590ed562b89db51fe46cee5db96b9bc5abd8. + +Issues have been observed in LibreElec as this was unconditionally +loading the audio driver instead of having the DT parameter to +enable it. + +Includes a partial revert of 2147700eb7a1b9e55e0684f0749114ce35d61571 +which fixed up the error handling. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> +--- + .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +@@ -170,7 +170,6 @@ static struct class *vchiq_class; + static struct device *vchiq_dev; + static DEFINE_SPINLOCK(msg_queue_spinlock); + static struct platform_device *bcm2835_camera; +-static struct platform_device *bcm2835_audio; + static struct platform_device *bcm2835_codec; + static struct platform_device *vcsm_cma; + +@@ -3662,9 +3661,6 @@ static int vchiq_probe(struct platform_d + bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); + if (IS_ERR(bcm2835_camera)) + bcm2835_camera = NULL; +- bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); +- if (IS_ERR(bcm2835_audio)) +- bcm2835_audio = NULL; + bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec"); + if (IS_ERR(bcm2835_codec)) + bcm2835_codec = NULL; +@@ -3685,7 +3681,6 @@ failed_platform_init: + static int vchiq_remove(struct platform_device *pdev) + { + platform_device_unregister(bcm2835_codec); +- platform_device_unregister(bcm2835_audio); + platform_device_unregister(bcm2835_camera); + platform_device_unregister(vcsm_cma); + vchiq_debugfs_deinit(); |