2019-09-19 14:43:19 +00:00
|
|
|
From 91aa97cc3a193cfd29962e328f9d1da0d8e0aaff Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: 6by9 <6by9@users.noreply.github.com>
|
|
|
|
|
Date: Wed, 30 Jan 2019 14:22:03 +0000
|
2019-09-19 14:43:19 +00:00
|
|
|
Subject: [PATCH 641/806] ARM: dts: bcm283x: Correct vchiq compatible string
|
2019-07-09 18:32:28 +00:00
|
|
|
(#2840)
|
|
|
|
|
|
|
|
|
|
commit 499770ede3f829e80539f46b59b5f460dc327aa6 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 <phil@raspberrypi.org>
|
|
|
|
|
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
|
|
|
|
|
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
|
|
|
|
---
|
|
|
|
|
arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +-
|
|
|
|
|
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +-
|
|
|
|
|
arch/arm/boot/dts/bcm2836-rpi.dtsi | 6 ++++++
|
|
|
|
|
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +-
|
|
|
|
|
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +-
|
|
|
|
|
5 files changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
|
create mode 100644 arch/arm/boot/dts/bcm2836-rpi.dtsi
|
|
|
|
|
|
|
|
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
|
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
|
|
|
@@ -30,7 +30,7 @@
|
|
|
|
|
#power-domain-cells = <1>;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
- mailbox@7e00b840 {
|
|
|
|
|
+ vchiq: mailbox@7e00b840 {
|
|
|
|
|
compatible = "brcm,bcm2835-vchiq";
|
|
|
|
|
reg = <0x7e00b840 0x3c>;
|
|
|
|
|
interrupts = <0 2>;
|
|
|
|
|
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
|
|
|
|
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
|
|
|
|
@@ -1,7 +1,7 @@
|
|
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
|
/dts-v1/;
|
|
|
|
|
#include "bcm2836.dtsi"
|
|
|
|
|
-#include "bcm2835-rpi.dtsi"
|
|
|
|
|
+#include "bcm2836-rpi.dtsi"
|
|
|
|
|
#include "bcm283x-rpi-smsc9514.dtsi"
|
|
|
|
|
#include "bcm283x-rpi-usb-host.dtsi"
|
|
|
|
|
#include "bcm283x-rpi-csi1-2lane.dtsi"
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi
|
|
|
|
|
@@ -0,0 +1,6 @@
|
|
|
|
|
+// SPDX-License-Identifier: GPL-2.0
|
|
|
|
|
+#include "bcm2835-rpi.dtsi"
|
|
|
|
|
+
|
|
|
|
|
+&vchiq {
|
|
|
|
|
+ compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
|
|
|
|
|
+};
|
|
|
|
|
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
|
|
|
|
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
|
|
|
|
@@ -1,7 +1,7 @@
|
|
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
|
/dts-v1/;
|
|
|
|
|
#include "bcm2837.dtsi"
|
|
|
|
|
-#include "bcm2835-rpi.dtsi"
|
|
|
|
|
+#include "bcm2836-rpi.dtsi"
|
|
|
|
|
#include "bcm283x-rpi-lan7515.dtsi"
|
|
|
|
|
#include "bcm283x-rpi-usb-host.dtsi"
|
|
|
|
|
|
|
|
|
|
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
|
|
|
|
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
|
|
|
|
@@ -1,7 +1,7 @@
|
|
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
|
/dts-v1/;
|
|
|
|
|
#include "bcm2837.dtsi"
|
|
|
|
|
-#include "bcm2835-rpi.dtsi"
|
|
|
|
|
+#include "bcm2836-rpi.dtsi"
|
|
|
|
|
#include "bcm283x-rpi-smsc9514.dtsi"
|
|
|
|
|
#include "bcm283x-rpi-usb-host.dtsi"
|
|
|
|
|
#include "bcm283x-rpi-csi1-2lane.dtsi"
|
