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
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
|
From 6f6916802d79d16acd3339f96a2d87da52fa1ad1 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 6 Feb 2018 13:10:09 +0000
Subject: [PATCH 195/454] BCM270X_DT: More cosmetic DT changes
Remove unnecessary duplicate labels (but keep spi0).
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
---
arch/arm/boot/dts/bcm2708-rpi.dtsi | 5 ----
arch/arm/boot/dts/bcm270x.dtsi | 15 ++++------
.../dts/overlays/vc4-fkms-v3d-overlay.dts | 2 +-
.../boot/dts/overlays/vc4-kms-v3d-overlay.dts | 29 +++++++------------
4 files changed, 17 insertions(+), 34 deletions(-)
--- a/arch/arm/boot/dts/bcm2708-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
@@ -81,11 +81,6 @@
status = "okay";
};
- thermal: thermal@7e212000 {
- #thermal-sensor-cells = <0>;
- status = "okay";
- };
-
/* Onboard audio */
audio: audio {
compatible = "brcm,bcm2835-audio";
--- a/arch/arm/boot/dts/bcm270x.dtsi
+++ b/arch/arm/boot/dts/bcm270x.dtsi
@@ -12,10 +12,6 @@
/* Add alias */
};
- cprman: cprman@7e101000 {
- /* Add alias */
- };
-
random: rng@7e104000 {
/* Add alias */
};
@@ -94,7 +90,7 @@
reg = <0x7e600000 0x100>;
interrupts = <2 16>;
clocks = <&clocks BCM2835_CLOCK_SMI>;
- assigned-clocks = <&cprman BCM2835_CLOCK_SMI>;
+ assigned-clocks = <&clocks BCM2835_CLOCK_SMI>;
assigned-clock-rates = <125000000>;
dmas = <&dma 4>;
dma-names = "rx-tx";
@@ -124,11 +120,6 @@
status = "disabled";
};
- gpu: gpu {
- /* Add alias */
- status = "disabled";
- };
-
axiperf: axiperf {
compatible = "brcm,bcm2835-axiperf";
reg = <0x7e009800 0x100>,
@@ -177,3 +168,7 @@
interrupt-parent = <&aux>;
interrupts = <2>;
};
+
+&vc4 {
+ status = "disabled";
+};
--- a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
+++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
@@ -66,7 +66,7 @@
};
fragment@8 {
- target = <&gpu>;
+ target = <&vc4>;
__overlay__ {
status = "okay";
};
--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
@@ -53,20 +53,13 @@
};
fragment@6 {
- target = <&cprman>;
- __overlay__ {
- status = "okay";
- };
- };
-
- fragment@7 {
target = <&fb>;
__overlay__ {
status = "disabled";
};
};
- fragment@8 {
+ fragment@7 {
target = <&pixelvalve0>;
__overlay__ {
interrupts = <2 13>; /* pwa0 */
@@ -74,7 +67,7 @@
};
};
- fragment@9 {
+ fragment@8 {
target = <&pixelvalve1>;
__overlay__ {
interrupts = <2 14>; /* pwa1 */
@@ -82,7 +75,7 @@
};
};
- fragment@10 {
+ fragment@9 {
target = <&pixelvalve2>;
__overlay__ {
interrupts = <2 10>; /* pixelvalve */
@@ -90,7 +83,7 @@
};
};
- fragment@11 {
+ fragment@10 {
target = <&hvs>;
__overlay__ {
interrupts = <2 1>;
@@ -98,7 +91,7 @@
};
};
- fragment@12 {
+ fragment@11 {
target = <&hdmi>;
__overlay__ {
interrupts = <2 8>, <2 9>;
@@ -106,7 +99,7 @@
};
};
- fragment@13 {
+ fragment@12 {
target = <&v3d>;
__overlay__ {
interrupts = <1 10>;
@@ -114,14 +107,14 @@
};
};
- fragment@14 {
- target = <&gpu>;
+ fragment@13 {
+ target = <&vc4>;
__overlay__ {
status = "okay";
};
};
- fragment@15 {
+ fragment@14 {
target-path = "/soc/dma";
__overlay__ {
brcm,dma-channel-mask = <0x7f35>;
@@ -129,7 +122,7 @@
};
- fragment@16 {
+ fragment@15 {
target = <&clocks>;
__overlay__ {
claim-clocks = <
@@ -141,7 +134,7 @@
};
};
- fragment@17 {
+ fragment@16 {
target = <&vec>;
__overlay__ {
status = "okay";
|
