df68cbf
From b76b1cdf2e569cceab41dcf3b3f6a90965d0a02c Mon Sep 17 00:00:00 2001
df68cbf
From: Eric Anholt <eric@anholt.net>
df68cbf
Date: Fri, 4 Mar 2016 10:39:29 -0800
df68cbf
Subject: [PATCH 28/36] ARM: bcm2835: Add devicetree for the Raspberry Pi 3.
df68cbf
df68cbf
For now this doesn't support the new hardware present on the Pi 3 (BT,
df68cbf
wifi, GPIO expander).  Since the GPIO expander isn't supported, we
df68cbf
also don't have the LEDs like the other board files do.
df68cbf
df68cbf
Signed-off-by: Eric Anholt <eric@anholt.net>
df68cbf
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
df68cbf
---
df68cbf
 arch/arm/boot/dts/Makefile            |  3 +-
df68cbf
 arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 22 ++++++++++++
df68cbf
 arch/arm/boot/dts/bcm2837.dtsi        | 68 +++++++++++++++++++++++++++++++++++
df68cbf
 3 files changed, 92 insertions(+), 1 deletion(-)
df68cbf
 create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts
df68cbf
 create mode 100644 arch/arm/boot/dts/bcm2837.dtsi
df68cbf
df68cbf
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
df68cbf
index d000814..a8a0767 100644
df68cbf
--- a/arch/arm/boot/dts/Makefile
df68cbf
+++ b/arch/arm/boot/dts/Makefile
df68cbf
@@ -64,7 +64,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
df68cbf
 	bcm2835-rpi-b-rev2.dtb \
df68cbf
 	bcm2835-rpi-b-plus.dtb \
df68cbf
 	bcm2835-rpi-a-plus.dtb \
df68cbf
-	bcm2836-rpi-2-b.dtb
df68cbf
+	bcm2836-rpi-2-b.dtb \
df68cbf
+	bcm2837-rpi-3-b.dtb
df68cbf
 dtb-$(CONFIG_ARCH_BCM_5301X) += \
df68cbf
 	bcm4708-asus-rt-ac56u.dtb \
df68cbf
 	bcm4708-asus-rt-ac68u.dtb \
df68cbf
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
df68cbf
new file mode 100644
df68cbf
index 0000000..5e8eafd
df68cbf
--- /dev/null
df68cbf
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
df68cbf
@@ -0,0 +1,22 @@
df68cbf
+/dts-v1/;
df68cbf
+#include "bcm2837.dtsi"
df68cbf
+#include "bcm2835-rpi.dtsi"
df68cbf
+
df68cbf
+/ {
df68cbf
+	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
df68cbf
+	model = "Raspberry Pi 3 Model B";
df68cbf
+
df68cbf
+	memory {
df68cbf
+		reg = <0 0x40000000>;
df68cbf
+	};
df68cbf
+};
df68cbf
+
df68cbf
+&gpio {
df68cbf
+	pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
df68cbf
+
df68cbf
+	/* I2S interface */
df68cbf
+	i2s_alt0: i2s_alt0 {
df68cbf
+		brcm,pins = <28 29 30 31>;
df68cbf
+		brcm,function = <BCM2835_FSEL_ALT2>;
df68cbf
+	};
df68cbf
+};
df68cbf
diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
df68cbf
new file mode 100644
df68cbf
index 0000000..2f36722
df68cbf
--- /dev/null
df68cbf
+++ b/arch/arm/boot/dts/bcm2837.dtsi
df68cbf
@@ -0,0 +1,68 @@
df68cbf
+#include "bcm283x.dtsi"
df68cbf
+
df68cbf
+/ {
df68cbf
+	compatible = "brcm,bcm2836";
df68cbf
+
df68cbf
+	soc {
df68cbf
+		ranges = <0x7e000000 0x3f000000 0x1000000>,
df68cbf
+			 <0x40000000 0x40000000 0x00001000>;
df68cbf
+		dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
df68cbf
+
df68cbf
+		local_intc: local_intc {
df68cbf
+			compatible = "brcm,bcm2836-l1-intc";
df68cbf
+			reg = <0x40000000 0x100>;
df68cbf
+			interrupt-controller;
df68cbf
+			#interrupt-cells = <1>;
df68cbf
+			interrupt-parent = <&local_intc>;
df68cbf
+		};
df68cbf
+	};
df68cbf
+
df68cbf
+	timer {
df68cbf
+		compatible = "arm,armv7-timer";
df68cbf
+		interrupt-parent = <&local_intc>;
df68cbf
+		interrupts = <0>, // PHYS_SECURE_PPI
df68cbf
+			     <1>, // PHYS_NONSECURE_PPI
df68cbf
+			     <3>, // VIRT_PPI
df68cbf
+			     <2>; // HYP_PPI
df68cbf
+		always-on;
df68cbf
+	};
df68cbf
+
df68cbf
+	cpus: cpus {
df68cbf
+		#address-cells = <1>;
df68cbf
+		#size-cells = <0>;
df68cbf
+
df68cbf
+		cpu0: cpu@0 {
df68cbf
+			device_type = "cpu";
df68cbf
+			compatible = "arm,cortex-a53";
df68cbf
+			reg = <0>;
df68cbf
+		};
df68cbf
+
df68cbf
+		cpu1: cpu@1 {
df68cbf
+			device_type = "cpu";
df68cbf
+			compatible = "arm,cortex-a53";
df68cbf
+			reg = <1>;
df68cbf
+		};
df68cbf
+
df68cbf
+		cpu2: cpu@2 {
df68cbf
+			device_type = "cpu";
df68cbf
+			compatible = "arm,cortex-a53";
df68cbf
+			reg = <2>;
df68cbf
+		};
df68cbf
+
df68cbf
+		cpu3: cpu@3 {
df68cbf
+			device_type = "cpu";
df68cbf
+			compatible = "arm,cortex-a53";
df68cbf
+			reg = <3>;
df68cbf
+		};
df68cbf
+	};
df68cbf
+};
df68cbf
+
df68cbf
+/* Make the BCM2835-style global interrupt controller be a child of the
df68cbf
+ * CPU-local interrupt controller.
df68cbf
+ */
df68cbf
+&intc {
df68cbf
+	compatible = "brcm,bcm2836-armctrl-ic";
df68cbf
+	reg = <0x7e00b200 0x200>;
df68cbf
+	interrupt-parent = <&local_intc>;
df68cbf
+	interrupts = <8>;
df68cbf
+};
df68cbf
-- 
df68cbf
2.7.3
df68cbf
df68cbf
From 528285e99c25249456023d28f521689bf9e9eb8b Mon Sep 17 00:00:00 2001
df68cbf
From: Peter Robinson <pbrobinson@gmail.com>
df68cbf
Date: Wed, 30 Mar 2016 09:35:13 +0100
df68cbf
Subject: [PATCH 32/36] drop usb power domain support for the moment, kills usb
df68cbf
df68cbf
---
df68cbf
 arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 ----
df68cbf
 1 file changed, 4 deletions(-)
df68cbf
df68cbf
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
df68cbf
index caf2707..b1e8145 100644
df68cbf
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
df68cbf
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
df68cbf
@@ -71,10 +71,6 @@
df68cbf
 	status = "okay";
df68cbf
 };
df68cbf
 
df68cbf
-&usb {
df68cbf
-	power-domains = <&power RPI_POWER_DOMAIN_USB>;
df68cbf
-};
df68cbf
-
df68cbf
 &v3d {
df68cbf
 	power-domains = <&power RPI_POWER_DOMAIN_V3D>;
df68cbf
 };
df68cbf
-- 
df68cbf
2.7.3
df68cbf