Skip to content

Commit 1c28be7

Browse files
Phil Elwellpopcornmix
Phil Elwell
authored andcommitted
arm: dts: Change downstream vchiq compatible string
The new cache line size mechanism requires a different vchiq compatible string on BCM2836 and BCM2837, but the downstream dts files didn't inherit the upstream changes. See: #2643 Signed-off-by: Phil Elwell <[email protected]>
1 parent 73214e9 commit 1c28be7

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
status = "disabled";
6969
};
7070

71-
mailbox@7e00b840 {
71+
vchiq: mailbox@7e00b840 {
7272
compatible = "brcm,bcm2835-vchiq";
7373
reg = <0x7e00b840 0x3c>;
7474
interrupts = <0 2>;

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

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

arch/arm/boot/dts/bcm2709.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "bcm2836.dtsi"
22
#include "bcm270x.dtsi"
3-
#include "bcm2708-rpi.dtsi"
3+
#include "bcm2709-rpi.dtsi"
44

55
/ {
66
soc {

arch/arm/boot/dts/bcm2710.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "bcm2837.dtsi"
22
#include "bcm270x.dtsi"
3-
#include "bcm2708-rpi.dtsi"
3+
#include "bcm2709-rpi.dtsi"
44

55
/ {
66
compatible = "brcm,bcm2837", "brcm,bcm2836";

0 commit comments

Comments
 (0)