X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0296-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch;fp=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0296-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch;h=31e050aa55e25f7f05dc370de35df504112e38bb;hp=0000000000000000000000000000000000000000;hb=84d555aa74434392b682fd9eb0fa701c89a046d6;hpb=953973c2991e8640549a55df7a0574a1abac8644

diff --git a/target/linux/brcm2708/patches-4.19/950-0296-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch b/target/linux/brcm2708/patches-4.19/950-0296-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch
new file mode 100644
index 0000000000..31e050aa55
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.19/950-0296-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch
@@ -0,0 +1,47 @@
+From f03f60a51efdf7fbc1f7d2c5b120a7de93ea6d9e Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.org>
+Date: Tue, 29 Jan 2019 16:13:25 +0000
+Subject: [PATCH] staging: vchiq_arm: Set up dma ranges on child
+ devices
+
+The VCHIQ driver now loads the audio, camera, codec, and vc-sm
+drivers as platform drivers. However they were not being given
+the correct DMA configuration.
+
+Call of_dma_configure with the parent (VCHIQ) parameters to be
+inherited by the child.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
+---
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c   | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+@@ -3585,6 +3585,7 @@ static struct platform_device *
+ vchiq_register_child(struct platform_device *pdev, const char *name)
+ {
+ 	struct platform_device_info pdevinfo;
++	struct platform_device *new_dev;
+ 
+ 	memset(&pdevinfo, 0, sizeof(pdevinfo));
+ 
+@@ -3593,7 +3594,17 @@ vchiq_register_child(struct platform_dev
+ 	pdevinfo.id = PLATFORM_DEVID_NONE;
+ 	pdevinfo.dma_mask = DMA_BIT_MASK(32);
+ 
+-	return platform_device_register_full(&pdevinfo);
++	new_dev = platform_device_register_full(&pdevinfo);
++	if (!new_dev)
++		return NULL;
++
++	/*
++	 * We want the dma-ranges etc to be copied from the parent VCHIQ device
++	 * to be passed on to the children too.
++	 */
++	of_dma_configure(&new_dev->dev, pdev->dev.of_node, true);
++
++	return new_dev;
+ }
+ 
+ static int vchiq_probe(struct platform_device *pdev)