Skip to content

Commit 73214e9

Browse files
6by9popcornmix
authored andcommitted
ARM: dts: bcm283x: Correct vchiq compatible string (#2840)
commit 499770e upstream. 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 <[email protected]> Acked-by: Stefan Wahren <[email protected]> Signed-off-by: Stefan Wahren <[email protected]>
1 parent faab0dd commit 73214e9

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-5
lines changed

arch/arm/boot/dts/bcm2835-rpi.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#power-domain-cells = <1>;
3131
};
3232

33-
mailbox@7e00b840 {
33+
vchiq: mailbox@7e00b840 {
3434
compatible = "brcm,bcm2835-vchiq";
3535
reg = <0x7e00b840 0x3c>;
3636
interrupts = <0 2>;

arch/arm/boot/dts/bcm2836-rpi-2-b.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/dts-v1/;
33
#include "bcm2836.dtsi"
4-
#include "bcm2835-rpi.dtsi"
4+
#include "bcm2836-rpi.dtsi"
55
#include "bcm283x-rpi-smsc9514.dtsi"
66
#include "bcm283x-rpi-usb-host.dtsi"
77

arch/arm/boot/dts/bcm2836-rpi.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
#include "bcm2835-rpi.dtsi"
3+
4+
&vchiq {
5+
compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
6+
};

arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/dts-v1/;
33
#include "bcm2837.dtsi"
4-
#include "bcm2835-rpi.dtsi"
4+
#include "bcm2836-rpi.dtsi"
55
#include "bcm283x-rpi-lan7515.dtsi"
66
#include "bcm283x-rpi-usb-host.dtsi"
77

arch/arm/boot/dts/bcm2837-rpi-3-b.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/dts-v1/;
33
#include "bcm2837.dtsi"
4-
#include "bcm2835-rpi.dtsi"
4+
#include "bcm2836-rpi.dtsi"
55
#include "bcm283x-rpi-smsc9514.dtsi"
66
#include "bcm283x-rpi-usb-host.dtsi"
77

arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/dts-v1/;
33
#include "bcm2837.dtsi"
4-
#include "bcm2835-rpi.dtsi"
4+
#include "bcm2836-rpi.dtsi"
55

66
/ {
77
memory {

0 commit comments

Comments
 (0)