brcm2708: update to latest patches from RPi foundation

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0205-staging-vchiq_arm-Fix-camera-device-registration.patch

diff --git a/target/linux/brcm2708/patches-4.19/950-0205-staging-vchiq_arm-Fix-camera-device-registration.patch b/target/linux/brcm2708/patches-4.19/950-0205-staging-vchiq_arm-Fix-camera-device-registration.patch
deleted file mode 100644 (file)
index 9cf02e9..0000000
--- a/target/linux/brcm2708/patches-4.19/950-0205-staging-vchiq_arm-Fix-camera-device-registration.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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;
-