bcm27xx: update patches from RPi foundation

[openwrt/staging/luka.git] / target / linux / bcm27xx / patches-5.4 / 950-0757-ARM-dts-Update-for-new-VCHIQ-BCM2711-DMA-support.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0757-ARM-dts-Update-for-new-VCHIQ-BCM2711-DMA-support.patch b/target/linux/bcm27xx/patches-5.4/950-0757-ARM-dts-Update-for-new-VCHIQ-BCM2711-DMA-support.patch
new file mode 100644 (file)
index 0000000..947fb73
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.4/950-0757-ARM-dts-Update-for-new-VCHIQ-BCM2711-DMA-support.patch
@@ -0,0 +1,67 @@
+From 79495a5ecdfba69de51e88701a69c42d09806d84 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Wed, 20 May 2020 16:36:57 +0100
+Subject: [PATCH] ARM: dts: Update for new VCHIQ BCM2711 DMA support
+
+Now that the enhanced BCM2711 DMA controller is located by compatible
+string and used directly for generating bulk transfer addresses,
+remove the workaround of moving the vchiq node.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2711-rpi.dtsi | 23 ++++-------------------
+ 1 file changed, 4 insertions(+), 19 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
++++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
+@@ -4,7 +4,6 @@
+ / {
+       soc {
+               /delete-node/ v3d@7ec00000;
+-              /delete-node/ mailbox@7e00b840;
+       };
+ 
+       __overrides__ {
+@@ -88,12 +87,6 @@
+               brcm,dma-channel-mask = <0x7800>;
+       };
+ 
+-      vchiq: mailbox@7e00b840 {
+-              compatible = "brcm,bcm2711-vchiq";
+-              reg = <0 0x7e00b840  0x0 0x3c>;
+-              interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
+-      };
+-
+       xhci: xhci@7e9c0000 {
+               compatible = "generic-xhci";
+               status = "disabled";
+@@ -127,18 +120,6 @@
+       };
+ };
+ 
+-&vchiq {
+-      /* Onboard audio
+-       * This node is replicated because the original from bcm270x-rpi.dtsi
+-       * was deleted when the vchiq node was deleted above.
+-       */
+-      audio: bcm2835_audio {
+-              compatible = "brcm,bcm2835-audio";
+-              brcm,pwm-channels = <8>;
+-              status = "disabled";
+-      };
+-};
+-
+ &dma {
+       /* The VPU firmware uses DMA channel 11 for VCHIQ */
+       brcm,dma-channel-mask = <0x1f5>;
+@@ -149,6 +130,10 @@
+       brcm,dma-channel-mask = <0x7000>;
+ };
+ 
++&vchiq {
++      compatible = "brcm,bcm2711-vchiq";
++};
++
+ &firmwarekms {
+       interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+ };