diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-09 19:50:30 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-27 11:10:01 +0200 |
commit | 2340c646e6a5da658e114be2f721ff90853588d4 (patch) | |
tree | df9744d2344e71e8c5d1b75c3e1528bc474313fe /target/linux/brcm2708/patches-4.19/950-0339-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch | |
parent | 81d0da118694feb874f992093063a2852285d194 (diff) | |
download | upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.gz upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.bz2 upstream-2340c646e6a5da658e114be2f721ff90853588d4.zip |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0339-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0339-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0339-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch b/target/linux/brcm2708/patches-4.19/950-0339-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch new file mode 100644 index 0000000000..0cdc812cf3 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0339-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch @@ -0,0 +1,47 @@ +From 40002e5f988a815a9bdfc20a015b64ebed0b7383 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 339/773] 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) |