1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
From 8b2b33292610a414d8cc3a7a78104fd375bf0cce Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 29 May 2019 15:19:21 +0100
Subject: [PATCH 531/703] 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;
};
|
