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
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
|
From 38dcfe11a53bf7467858b1bae60e16754bf1869f Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Fri, 10 Mar 2023 10:02:35 +0000
Subject: [PATCH] ARM: dts: Standardise on the upstream LED names
Historically, downstream Pi DTS files have named the LEDs led0 and (if
present) led1, while upstream have used the more meaningful "ACT" and
"PWR". As part of a closer alignment with upstream, make the LED names
match.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 3 +--
arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts | 1 -
arch/arm/boot/dts/bcm2708-rpi-b.dts | 1 -
arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 1 -
arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 1 -
arch/arm/boot/dts/bcm2708-rpi-zero.dts | 1 -
arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 3 +--
arch/arm/boot/dts/bcm2709-rpi-cm2.dts | 1 -
arch/arm/boot/dts/bcm2710-rpi-2-b.dts | 3 +--
arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 3 +--
arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 3 +--
arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 1 -
arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 1 -
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 --
arch/arm/boot/dts/bcm2711-rpi-400.dts | 2 --
arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 2 --
arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 1 -
17 files changed, 5 insertions(+), 25 deletions(-)
--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
@@ -157,14 +157,13 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&gpio 47 0>;
};
pwr_led: led-pwr {
- label = "led1";
+ label = "PWR";
default-state = "off";
linux,default-trigger = "input";
gpios = <&gpio 35 0>;
--- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
@@ -175,7 +175,6 @@ i2c_csi_dsi: &i2c1 {
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&gpio 16 1>;
--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
@@ -157,7 +157,6 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&gpio 16 1>;
--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
@@ -3,7 +3,6 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&gpio 47 0>;
--- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
@@ -213,7 +213,6 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "actpwr";
gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
--- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
@@ -154,7 +154,6 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "actpwr";
gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -157,14 +157,13 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&gpio 47 0>;
};
pwr_led: led-pwr {
- label = "led1";
+ label = "PWR";
default-state = "off";
linux,default-trigger = "input";
gpios = <&gpio 35 0>;
--- a/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
+++ b/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
@@ -191,7 +191,6 @@ cam0_reg: &cam0_regulator {
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&virtgpio 0 0>;
--- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
@@ -157,14 +157,13 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&gpio 47 0>;
};
pwr_led: led-pwr {
- label = "led1";
+ label = "PWR";
default-state = "off";
linux,default-trigger = "input";
gpios = <&gpio 35 0>;
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
@@ -233,14 +233,13 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&gpio 29 0>;
};
pwr_led: led-pwr {
- label = "led1";
+ label = "PWR";
default-state = "off";
linux,default-trigger = "default-on";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -248,14 +248,13 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&virtgpio 0 0>;
};
pwr_led: led-pwr {
- label = "led1";
+ label = "PWR";
default-state = "off";
linux,default-trigger = "input";
gpios = <&expgpio 7 0>;
--- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
@@ -190,7 +190,6 @@ cam0_reg: &cam0_regulator {
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&virtgpio 0 0>;
--- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
@@ -226,7 +226,6 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "actpwr";
gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -506,14 +506,12 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
pwr_led: led-pwr {
- label = "led1";
default-state = "off";
linux,default-trigger = "default-on";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
@@ -513,14 +513,12 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "default-on";
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
pwr_led: led-pwr {
- label = "led1";
default-state = "off";
linux,default-trigger = "default-on";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
@@ -518,14 +518,12 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
};
pwr_led: led-pwr {
- label = "led1";
default-state = "off";
linux,default-trigger = "default-on";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
@@ -388,7 +388,6 @@
&leds {
act_led: led-act {
- label = "led0";
default-state = "off";
linux,default-trigger = "mmc0";
};
|