1 From 79495a5ecdfba69de51e88701a69c42d09806d84 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Wed, 20 May 2020 16:36:57 +0100
4 Subject: [PATCH] ARM: dts: Update for new VCHIQ BCM2711 DMA support
6 Now that the enhanced BCM2711 DMA controller is located by compatible
7 string and used directly for generating bulk transfer addresses,
8 remove the workaround of moving the vchiq node.
10 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
12 arch/arm/boot/dts/bcm2711-rpi.dtsi | 23 ++++-------------------
13 1 file changed, 4 insertions(+), 19 deletions(-)
15 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
16 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
20 /delete-node/ v3d@7ec00000;
21 - /delete-node/ mailbox@7e00b840;
26 brcm,dma-channel-mask = <0x7800>;
29 - vchiq: mailbox@7e00b840 {
30 - compatible = "brcm,bcm2711-vchiq";
31 - reg = <0 0x7e00b840 0x0 0x3c>;
32 - interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
36 compatible = "generic-xhci";
44 - * This node is replicated because the original from bcm270x-rpi.dtsi
45 - * was deleted when the vchiq node was deleted above.
47 - audio: bcm2835_audio {
48 - compatible = "brcm,bcm2835-audio";
49 - brcm,pwm-channels = <8>;
50 - status = "disabled";
55 /* The VPU firmware uses DMA channel 11 for VCHIQ */
56 brcm,dma-channel-mask = <0x1f5>;
58 brcm,dma-channel-mask = <0x7000>;
62 + compatible = "brcm,bcm2711-vchiq";
66 interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;