brcm2708: organize kernel patches
[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0477-BCM270X_DT-Minor-tidy-up.patch
diff --git a/target/linux/brcm2708/patches-4.19/950-0477-BCM270X_DT-Minor-tidy-up.patch b/target/linux/brcm2708/patches-4.19/950-0477-BCM270X_DT-Minor-tidy-up.patch
new file mode 100644 (file)
index 0000000..70325f7
--- /dev/null
@@ -0,0 +1,95 @@
+From 021d54e3ae67e2b02310b9e3e871876a2c3b7eee Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.org>
+Date: Wed, 29 May 2019 15:19:21 +0100
+Subject: [PATCH] BCM270X_DT: Minor tidy up
+
+Move arm_pmu out of soc on bcm2710, and labels aren't aliases.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.org>
+---
+ arch/arm/boot/dts/bcm270x.dtsi | 14 +++++++-------
+ arch/arm/boot/dts/bcm2710.dtsi | 13 +++++--------
+ 2 files changed, 12 insertions(+), 15 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm270x.dtsi
++++ b/arch/arm/boot/dts/bcm270x.dtsi
+@@ -10,11 +10,11 @@
+       soc: soc {
+               watchdog: watchdog@7e100000 {
+-                      /* Add alias */
++                      /* Add label */
+               };
+               random: rng@7e104000 {
+-                      /* Add alias */
++                      /* Add label */
+               };
+               gpio@7e200000 { /* gpio */
+@@ -40,18 +40,18 @@
+               };
+               spi0: spi@7e204000 {
+-                      /* Add alias */
++                      /* Add label */
+                       dmas = <&dma 6>, <&dma 7>;
+                       dma-names = "tx", "rx";
+               };
+               pixelvalve0: pixelvalve@7e206000 {
+-                      /* Add alias */
++                      /* Add label */
+                       status = "disabled";
+               };
+               pixelvalve1: pixelvalve@7e207000 {
+-                      /* Add alias */
++                      /* Add label */
+                       status = "disabled";
+               };
+@@ -93,7 +93,7 @@
+               };
+               hvs: hvs@7e400000 {
+-                      /* Add alias */
++                      /* Add label */
+                       status = "disabled";
+               };
+@@ -119,7 +119,7 @@
+               };
+               pixelvalve2: pixelvalve@7e807000 {
+-                      /* Add alias */
++                      /* Add label */
+                       status = "disabled";
+               };
+--- a/arch/arm/boot/dts/bcm2710.dtsi
++++ b/arch/arm/boot/dts/bcm2710.dtsi
+@@ -5,18 +5,15 @@
+ / {
+       compatible = "brcm,bcm2837", "brcm,bcm2836";
+-      soc {
+-
+-              arm-pmu {
++      arm-pmu {
+ #ifdef RPI364
+-                      compatible = "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
++              compatible = "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
+ #else
+-                      compatible = "arm,cortex-a7-pmu";
++              compatible = "arm,cortex-a7-pmu";
+ #endif
+-                      interrupt-parent = <&local_intc>;
+-                      interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;
+-              };
++      };
++      soc {
+               /delete-node/ timer@7e003000;
+       };