diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 19:08:55 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 19:12:43 +0200 |
| commit | 77e97abf129c5028385dd72587eabab68db0d954 (patch) | |
| tree | fc52a8c2ba346da77281f00538a1eb6de49deb5d /target/linux/bcm27xx/patches-5.4/950-0755-ARM-dts-Update-for-new-VCHIQ-BCM2711-DMA-support.patch | |
| parent | 5d3a0c6b26144eb5d62515b99613b5ad8dbdc717 (diff) | |
| download | upstream-77e97abf129c5028385dd72587eabab68db0d954.tar.gz upstream-77e97abf129c5028385dd72587eabab68db0d954.tar.bz2 upstream-77e97abf129c5028385dd72587eabab68db0d954.zip | |
bcm27xx: update to latest patches from RPi foundation
Also removes random module and switches to new bcm2711 thermal driver.
Boot tested on RPi 4B v1.1 4G.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0755-ARM-dts-Update-for-new-VCHIQ-BCM2711-DMA-support.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0755-ARM-dts-Update-for-new-VCHIQ-BCM2711-DMA-support.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0755-ARM-dts-Update-for-new-VCHIQ-BCM2711-DMA-support.patch b/target/linux/bcm27xx/patches-5.4/950-0755-ARM-dts-Update-for-new-VCHIQ-BCM2711-DMA-support.patch new file mode 100644 index 0000000000..947fb73a39 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0755-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>; + }; |