Commit e86d6046 authored by Phil Elwell's avatar Phil Elwell Committed by popcornmix
Browse files

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: https://github.com/raspberrypi/linux/issues/2643



Signed-off-by: default avatarPhil Elwell <phil@raspberrypi.org>
parent 8a17ffd8

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
			status = "disabled";

		};



		mailbox@7e00b840 {

		vchiq: mailbox@7e00b840 {

			compatible = "brcm,bcm2835-vchiq";

			reg = <0x7e00b840 0x3c>;

			interrupts = <0 2>;

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

0 → 100644
+5 −0
Original line number Diff line number Diff line 
#include "bcm2708-rpi.dtsi"



&vchiq {

	compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";

};

arch/arm/boot/dts/bcm2709.dtsi

+1 −1
Original line number Diff line number Diff line 
#include "bcm2836.dtsi"

#include "bcm270x.dtsi"

#include "bcm2708-rpi.dtsi"

#include "bcm2709-rpi.dtsi"



/ {

	soc {

arch/arm/boot/dts/bcm2710.dtsi

+1 −1
Original line number Diff line number Diff line 
#include "bcm2837.dtsi"

#include "bcm270x.dtsi"

#include "bcm2708-rpi.dtsi"

#include "bcm2709-rpi.dtsi"



/ {

	compatible = "brcm,bcm2837", "brcm,bcm2836";