Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: bcm283x: Correct vchiq compatible string

To allow VCHIQ to determine the correct cache line size, use the new
"brcm,bcm2836-vchiq" compatible string on BCM2836 and BCM2837.

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>

authored by

Phil Elwell and committed by
Stefan Wahren
499770ed a2aabe5f

+11 -5
+1 -1
arch/arm/boot/dts/bcm2835-rpi.dtsi
··· 30 30 #power-domain-cells = <1>; 31 31 }; 32 32 33 - mailbox@7e00b840 { 33 + vchiq: mailbox@7e00b840 { 34 34 compatible = "brcm,bcm2835-vchiq"; 35 35 reg = <0x7e00b840 0xf>; 36 36 interrupts = <0 2>;
+1 -1
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /dts-v1/; 3 3 #include "bcm2836.dtsi" 4 - #include "bcm2835-rpi.dtsi" 4 + #include "bcm2836-rpi.dtsi" 5 5 #include "bcm283x-rpi-smsc9514.dtsi" 6 6 #include "bcm283x-rpi-usb-host.dtsi" 7 7
+6
arch/arm/boot/dts/bcm2836-rpi.dtsi
··· 1 + // SPDX-License-Identifier: GPL-2.0 2 + #include "bcm2835-rpi.dtsi" 3 + 4 + &vchiq { 5 + compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq"; 6 + };
+1 -1
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /dts-v1/; 3 3 #include "bcm2837.dtsi" 4 - #include "bcm2835-rpi.dtsi" 4 + #include "bcm2836-rpi.dtsi" 5 5 #include "bcm283x-rpi-lan7515.dtsi" 6 6 #include "bcm283x-rpi-usb-host.dtsi" 7 7
+1 -1
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /dts-v1/; 3 3 #include "bcm2837.dtsi" 4 - #include "bcm2835-rpi.dtsi" 4 + #include "bcm2836-rpi.dtsi" 5 5 #include "bcm283x-rpi-smsc9514.dtsi" 6 6 #include "bcm283x-rpi-usb-host.dtsi" 7 7
+1 -1
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /dts-v1/; 3 3 #include "bcm2837.dtsi" 4 - #include "bcm2835-rpi.dtsi" 4 + #include "bcm2836-rpi.dtsi" 5 5 6 6 / { 7 7 memory {