aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-4.19/950-0204-staging-vchiq_arm-Fix-camera-device-registration.patch
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-08 21:58:55 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-14 14:10:51 +0100
commit7d7aa2fd924c27829ec25f825481554dd81bce97 (patch)
tree658b87b89331670266163e522ea5fb52535633cb /target/linux/bcm27xx/patches-4.19/950-0204-staging-vchiq_arm-Fix-camera-device-registration.patch
parente7bfda2c243e66a75ff966ba04c28b1590b5d24c (diff)
downloadupstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.gz
upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.bz2
upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.zip
brcm2708: rename target to bcm27xx
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-4.19/950-0204-staging-vchiq_arm-Fix-camera-device-registration.patch')
-rw-r--r--target/linux/bcm27xx/patches-4.19/950-0204-staging-vchiq_arm-Fix-camera-device-registration.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-4.19/950-0204-staging-vchiq_arm-Fix-camera-device-registration.patch b/target/linux/bcm27xx/patches-4.19/950-0204-staging-vchiq_arm-Fix-camera-device-registration.patch
new file mode 100644
index 0000000000..9cf02e9ab9
--- /dev/null
+++ b/target/linux/bcm27xx/patches-4.19/950-0204-staging-vchiq_arm-Fix-camera-device-registration.patch
@@ -0,0 +1,56 @@
+From 58ed78a70c3c3ef1ae99aefdd2c28ac81f66df85 Mon Sep 17 00:00:00 2001
+From: Stefan Wahren <stefan.wahren@i2se.com>
+Date: Mon, 22 Oct 2018 15:16:51 +0200
+Subject: [PATCH] staging: vchiq_arm: Fix camera device registration
+
+Since the camera driver isn't probed via DT, we need to properly setup DMA.
+
+Fixes: 37b7b3087a2f ("staging/vc04_services: Register a platform device for the camera driver.")
+Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
+---
+ .../interface/vchiq_arm/vchiq_arm.c | 20 ++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
+
+--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+@@ -49,6 +49,7 @@
+ #include <linux/of.h>
+ #include <linux/platform_device.h>
+ #include <linux/compat.h>
++#include <linux/dma-mapping.h>
+ #include <soc/bcm2835/raspberrypi-firmware.h>
+
+ #include "vchiq_core.h"
+@@ -3578,6 +3579,21 @@ void vchiq_platform_conn_state_changed(V
+ }
+ }
+
++static struct platform_device *
++vchiq_register_child(struct platform_device *pdev, const char *name)
++{
++ struct platform_device_info pdevinfo;
++
++ memset(&pdevinfo, 0, sizeof(pdevinfo));
++
++ pdevinfo.parent = &pdev->dev;
++ pdevinfo.name = name;
++ pdevinfo.id = PLATFORM_DEVID_NONE;
++ pdevinfo.dma_mask = DMA_BIT_MASK(32);
++
++ return platform_device_register_full(&pdevinfo);
++}
++
+ static int vchiq_probe(struct platform_device *pdev)
+ {
+ struct device_node *fw_node;
+@@ -3637,9 +3653,7 @@ static int vchiq_probe(struct platform_d
+ VCHIQ_VERSION, VCHIQ_VERSION_MIN,
+ MAJOR(vchiq_devid), MINOR(vchiq_devid));
+
+- bcm2835_camera = platform_device_register_data(&pdev->dev,
+- "bcm2835-camera", -1,
+- NULL, 0);
++ bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
+
+ return 0;
+