mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
102 lines
2.1 KiB
Diff
102 lines
2.1 KiB
Diff
From 711cca4250649d13fd805fa9025c3377f957b0bc Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Wed, 29 May 2019 15:19:21 +0100
|
|
Subject: [PATCH 535/678] 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(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
|
|
index 86f3eb2d3f48..3b6c101dcd91 100644
|
|
--- 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";
|
|
};
|
|
|
|
diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
|
|
index 56d58f588203..7628ca59f028 100644
|
|
--- 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;
|
|
};
|
|
|
|
--
|
|
2.19.1
|
|
|