update bcm2837 with what's currently upstream for a64

3 files changed, 44 insertions, 27 deletions

diff --git a/bcm283x-upstream-fixes.patch b/bcm2837-initial-support.patch
index f6633aff9..0521f05f5 100644
--- a/bcm283x-upstream-fixes.patch
+++ b/bcm2837-initial-support.patch
@@ -1,27 +1,27 @@
-From b76b1cdf2e569cceab41dcf3b3f6a90965d0a02c Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Fri, 4 Mar 2016 10:39:29 -0800
-Subject: [PATCH 28/36] ARM: bcm2835: Add devicetree for the Raspberry Pi 3.
+From a2858804c7f5f4585b718543236b7ba3b3ec813a Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Mon, 29 Aug 2016 09:14:15 +0100
+Subject: [PATCH] ARM: bcm283x: Add devicetree for the Raspberry Pi 3.
 
 For now this doesn't support the new hardware present on the Pi 3 (BT,
-wifi, GPIO expander).  Since the GPIO expander isn't supported, we
-also don't have the LEDs like the other board files do.
+wifi, GPIO expander).
 
-Signed-off-by: Eric Anholt <eric@anholt.net>
-Acked-by: Stephen Warren <swarren@wwwdotorg.org>
+Rebased to the patch that went upstream for ARM64
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
  arch/arm/boot/dts/Makefile            |  3 +-
- arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 22 ++++++++++++
- arch/arm/boot/dts/bcm2837.dtsi        | 68 +++++++++++++++++++++++++++++++++++
- 3 files changed, 92 insertions(+), 1 deletion(-)
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 30 ++++++++++++++
+ arch/arm/boot/dts/bcm2837.dtsi        | 76 +++++++++++++++++++++++++++++++++++
+ 3 files changed, 108 insertions(+), 1 deletion(-)
  create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts
  create mode 100644 arch/arm/boot/dts/bcm2837.dtsi
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index d000814..a8a0767 100644
+index faacd52..ec41888 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -64,7 +64,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
+@@ -69,7 +69,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
  	bcm2835-rpi-b-rev2.dtb \
  	bcm2835-rpi-b-plus.dtb \
  	bcm2835-rpi-a-plus.dtb \
@@ -33,13 +33,14 @@ index d000814..a8a0767 100644
  	bcm4708-asus-rt-ac68u.dtb \
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 new file mode 100644
-index 0000000..5e8eafd
+index 0000000..7841b72
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,30 @@
 +/dts-v1/;
 +#include "bcm2837.dtsi"
 +#include "bcm2835-rpi.dtsi"
++#include "bcm283x-rpi-smsc9514.dtsi"
 +
 +/ {
 +	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
@@ -48,23 +49,30 @@ index 0000000..5e8eafd
 +	memory {
 +		reg = <0 0x40000000>;
 +	};
-+};
 +
-+&gpio {
-+	pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
++	leds {
++		act {
++			gpios = <&gpio 47 0>;
++		};
 +
-+	/* I2S interface */
-+	i2s_alt0: i2s_alt0 {
-+		brcm,pins = <28 29 30 31>;
-+		brcm,function = <BCM2835_FSEL_ALT2>;
++		pwr {
++			label = "PWR";
++			gpios = <&gpio 35 0>;
++			default-state = "keep";
++			linux,default-trigger = "default-on";
++		};
 +	};
 +};
++
++&uart1 {
++	status = "okay";
++};
 diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
 new file mode 100644
-index 0000000..2f36722
+index 0000000..8216bbb
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2837.dtsi
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,76 @@
 +#include "bcm283x.dtsi"
 +
 +/ {
@@ -102,24 +110,32 @@ index 0000000..2f36722
 +			device_type = "cpu";
 +			compatible = "arm,cortex-a53";
 +			reg = <0>;
++			enable-method = "spin-table";
++			cpu-release-addr = <0x0 0x000000d8>;
 +		};
 +
 +		cpu1: cpu@1 {
 +			device_type = "cpu";
 +			compatible = "arm,cortex-a53";
 +			reg = <1>;
++			enable-method = "spin-table";
++			cpu-release-addr = <0x0 0x000000e0>;
 +		};
 +
 +		cpu2: cpu@2 {
 +			device_type = "cpu";
 +			compatible = "arm,cortex-a53";
 +			reg = <2>;
++			enable-method = "spin-table";
++			cpu-release-addr = <0x0 0x000000e8>;
 +		};
 +
 +		cpu3: cpu@3 {
 +			device_type = "cpu";
 +			compatible = "arm,cortex-a53";
 +			reg = <3>;
++			enable-method = "spin-table";
++			cpu-release-addr = <0x0 0x000000f0>;
 +		};
 +	};
 +};
@@ -134,4 +150,5 @@ index 0000000..2f36722
 +	interrupts = <8>;
 +};
 -- 
-2.7.3
+2.9.3
+
diff --git a/config-arm64 b/config-arm64
index 2e0e88057..46708ff31 100644
--- a/config-arm64
+++ b/config-arm64
@@ -206,7 +206,7 @@ CONFIG_PWM_SUN4I=m
 # CONFIG_PHY_SUN4I_USB is not set
 # CONFIG_PHY_SUN9I_USB is not set
 CONFIG_NVMEM_SUNXI_SID=m
-# CONFIG_SUNXI_CCU is not set
+CONFIG_SUNXI_CCU=y
 # CONFIG_SUN8I_H3_CCU is not set
 
 # qcom
diff --git a/kernel.spec b/kernel.spec
index 1214cbd91..9819abcdb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -517,7 +517,7 @@ Patch427: omap-rtc-fix-am33xx.patch
 # http://patchwork.ozlabs.org/patch/587554/
 Patch430: ARM-tegra-usb-no-reset.patch
 
-Patch431: bcm283x-upstream-fixes.patch
+Patch431: bcm2837-initial-support.patch
 
 Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch