Skip to content

Commit 25b892b

Browse files
robherringarndb
robherring
authored and
arndb
committed
ARM: dts: arm: Update register-bit-led nodes 'reg' and node names
Add a 'reg' entry for register-bit-led nodes on the Arm Ltd platforms. The 'reg' entry is the LED control register address. With this, the node name can be updated to use a generic node name, 'led', and a unit-address. Signed-off-by: Rob Herring <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Liviu Dudau <[email protected]> Cc: Sudeep Holla <[email protected]> Cc: Lorenzo Pieralisi <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected]' Signed-off-by: Arnd Bergmann <[email protected]>
1 parent eb425d5 commit 25b892b

File tree

9 files changed

+144
-57
lines changed

9 files changed

+144
-57
lines changed

‎arch/arm/boot/dts/arm-realview-eb.dtsi

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,61 +198,72 @@
198198
syscon: syscon@10000000 {
199199
compatible = "arm,realview-eb-syscon", "syscon", "simple-mfd";
200200
reg = <0x10000000 0x1000>;
201+
ranges = <0x0 0x10000000 0x1000>;
202+
#address-cells = <1>;
203+
#size-cells = <1>;
201204

202-
led@08.0 {
205+
led@8,0 {
203206
compatible = "register-bit-led";
207+
reg = <0x08 0x04>;
204208
offset = <0x08>;
205209
mask = <0x01>;
206210
label = "versatile:0";
207211
linux,default-trigger = "heartbeat";
208212
default-state = "on";
209213
};
210-
led@08.1 {
214+
led@8,1 {
211215
compatible = "register-bit-led";
216+
reg = <0x08 0x04>;
212217
offset = <0x08>;
213218
mask = <0x02>;
214219
label = "versatile:1";
215220
linux,default-trigger = "mmc0";
216221
default-state = "off";
217222
};
218-
led@08.2 {
223+
led@8,2 {
219224
compatible = "register-bit-led";
225+
reg = <0x08 0x04>;
220226
offset = <0x08>;
221227
mask = <0x04>;
222228
label = "versatile:2";
223229
linux,default-trigger = "cpu0";
224230
default-state = "off";
225231
};
226-
led@08.3 {
232+
led@8,3 {
227233
compatible = "register-bit-led";
234+
reg = <0x08 0x04>;
228235
offset = <0x08>;
229236
mask = <0x08>;
230237
label = "versatile:3";
231238
default-state = "off";
232239
};
233-
led@08.4 {
240+
led@8,4 {
234241
compatible = "register-bit-led";
242+
reg = <0x08 0x04>;
235243
offset = <0x08>;
236244
mask = <0x10>;
237245
label = "versatile:4";
238246
default-state = "off";
239247
};
240-
led@08.5 {
248+
led@8,5 {
241249
compatible = "register-bit-led";
250+
reg = <0x08 0x04>;
242251
offset = <0x08>;
243252
mask = <0x20>;
244253
label = "versatile:5";
245254
default-state = "off";
246255
};
247-
led@08.6 {
256+
led@8,6 {
248257
compatible = "register-bit-led";
258+
reg = <0x08 0x04>;
249259
offset = <0x08>;
250260
mask = <0x40>;
251261
label = "versatile:6";
252262
default-state = "off";
253263
};
254-
led@08.7 {
264+
led@8,7 {
255265
compatible = "register-bit-led";
266+
reg = <0x08 0x04>;
256267
offset = <0x08>;
257268
mask = <0x80>;
258269
label = "versatile:7";

‎arch/arm/boot/dts/arm-realview-pb1176.dts

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,61 +216,72 @@
216216
syscon: syscon@10000000 {
217217
compatible = "arm,realview-pb1176-syscon", "syscon", "simple-mfd";
218218
reg = <0x10000000 0x1000>;
219+
ranges = <0x0 0x10000000 0x1000>;
220+
#address-cells = <1>;
221+
#size-cells = <1>;
219222

220-
led@08.0 {
223+
led@8,0 {
221224
compatible = "register-bit-led";
225+
reg = <0x08 0x04>;
222226
offset = <0x08>;
223227
mask = <0x01>;
224228
label = "versatile:0";
225229
linux,default-trigger = "heartbeat";
226230
default-state = "on";
227231
};
228-
led@08.1 {
232+
led@8,1 {
229233
compatible = "register-bit-led";
234+
reg = <0x08 0x04>;
230235
offset = <0x08>;
231236
mask = <0x02>;
232237
label = "versatile:1";
233238
linux,default-trigger = "mmc0";
234239
default-state = "off";
235240
};
236-
led@08.2 {
241+
led@8,2 {
237242
compatible = "register-bit-led";
243+
reg = <0x08 0x04>;
238244
offset = <0x08>;
239245
mask = <0x04>;
240246
label = "versatile:2";
241247
linux,default-trigger = "cpu0";
242248
default-state = "off";
243249
};
244-
led@08.3 {
250+
led@8,3 {
245251
compatible = "register-bit-led";
252+
reg = <0x08 0x04>;
246253
offset = <0x08>;
247254
mask = <0x08>;
248255
label = "versatile:3";
249256
default-state = "off";
250257
};
251-
led@08.4 {
258+
led@8,4 {
252259
compatible = "register-bit-led";
260+
reg = <0x08 0x04>;
253261
offset = <0x08>;
254262
mask = <0x10>;
255263
label = "versatile:4";
256264
default-state = "off";
257265
};
258-
led@08.5 {
266+
led@8,5 {
259267
compatible = "register-bit-led";
268+
reg = <0x08 0x04>;
260269
offset = <0x08>;
261270
mask = <0x20>;
262271
label = "versatile:5";
263272
default-state = "off";
264273
};
265-
led@08.6 {
274+
led@8,6 {
266275
compatible = "register-bit-led";
276+
reg = <0x08 0x04>;
267277
offset = <0x08>;
268278
mask = <0x40>;
269279
label = "versatile:6";
270280
default-state = "off";
271281
};
272-
led@08.7 {
282+
led@8,7 {
273283
compatible = "register-bit-led";
284+
reg = <0x08 0x04>;
274285
offset = <0x08>;
275286
mask = <0x80>;
276287
label = "versatile:7";

‎arch/arm/boot/dts/arm-realview-pb11mp.dts

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -303,64 +303,75 @@
303303
pb11mp_syscon: syscon@10000000 {
304304
compatible = "arm,realview-pb11mp-syscon", "syscon", "simple-mfd";
305305
reg = <0x10000000 0x1000>;
306+
ranges = <0x0 0x10000000 0x1000>;
307+
#address-cells = <1>;
308+
#size-cells = <1>;
306309

307-
led@08.0 {
310+
led@8,0 {
308311
compatible = "register-bit-led";
312+
reg = <0x08 0x04>;
309313
offset = <0x08>;
310314
mask = <0x01>;
311315
label = "versatile:0";
312316
linux,default-trigger = "heartbeat";
313317
default-state = "on";
314318
};
315-
led@08.1 {
319+
led@8,1 {
316320
compatible = "register-bit-led";
321+
reg = <0x08 0x04>;
317322
offset = <0x08>;
318323
mask = <0x02>;
319324
label = "versatile:1";
320325
linux,default-trigger = "mmc0";
321326
default-state = "off";
322327
};
323-
led@08.2 {
328+
led@8,2 {
324329
compatible = "register-bit-led";
330+
reg = <0x08 0x04>;
325331
offset = <0x08>;
326332
mask = <0x04>;
327333
label = "versatile:2";
328334
linux,default-trigger = "cpu0";
329335
default-state = "off";
330336
};
331-
led@08.3 {
337+
led@8,3 {
332338
compatible = "register-bit-led";
339+
reg = <0x08 0x04>;
333340
offset = <0x08>;
334341
mask = <0x08>;
335342
label = "versatile:3";
336343
linux,default-trigger = "cpu1";
337344
default-state = "off";
338345
};
339-
led@08.4 {
346+
led@8,4 {
340347
compatible = "register-bit-led";
348+
reg = <0x08 0x04>;
341349
offset = <0x08>;
342350
mask = <0x10>;
343351
label = "versatile:4";
344352
linux,default-trigger = "cpu2";
345353
default-state = "off";
346354
};
347-
led@08.5 {
355+
led@8,5 {
348356
compatible = "register-bit-led";
357+
reg = <0x08 0x04>;
349358
offset = <0x08>;
350359
mask = <0x20>;
351360
label = "versatile:5";
352361
linux,default-trigger = "cpu3";
353362
default-state = "off";
354363
};
355-
led@08.6 {
364+
led@8,6 {
356365
compatible = "register-bit-led";
366+
reg = <0x08 0x04>;
357367
offset = <0x08>;
358368
mask = <0x40>;
359369
label = "versatile:6";
360370
default-state = "off";
361371
};
362-
led@08.7 {
372+
led@8,7 {
363373
compatible = "register-bit-led";
374+
reg = <0x08 0x04>;
364375
offset = <0x08>;
365376
mask = <0x80>;
366377
label = "versatile:7";

‎arch/arm/boot/dts/arm-realview-pbx.dtsi

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,61 +220,72 @@
220220
syscon: syscon@10000000 {
221221
compatible = "arm,realview-pbx-syscon", "syscon", "simple-mfd";
222222
reg = <0x10000000 0x1000>;
223+
ranges = <0x0 0x10000000 0x1000>;
224+
#address-cells = <1>;
225+
#size-cells = <1>;
223226

224-
led@08.0 {
227+
led@8,0 {
225228
compatible = "register-bit-led";
229+
reg = <0x08 0x04>;
226230
offset = <0x08>;
227231
mask = <0x01>;
228232
label = "versatile:0";
229233
linux,default-trigger = "heartbeat";
230234
default-state = "on";
231235
};
232-
led@08.1 {
236+
led@8,1 {
233237
compatible = "register-bit-led";
238+
reg = <0x08 0x04>;
234239
offset = <0x08>;
235240
mask = <0x02>;
236241
label = "versatile:1";
237242
linux,default-trigger = "mmc0";
238243
default-state = "off";
239244
};
240-
led@08.2 {
245+
led@8,2 {
241246
compatible = "register-bit-led";
247+
reg = <0x08 0x04>;
242248
offset = <0x08>;
243249
mask = <0x04>;
244250
label = "versatile:2";
245251
linux,default-trigger = "cpu0";
246252
default-state = "off";
247253
};
248-
led@08.3 {
254+
led@8,3 {
249255
compatible = "register-bit-led";
256+
reg = <0x08 0x04>;
250257
offset = <0x08>;
251258
mask = <0x08>;
252259
label = "versatile:3";
253260
default-state = "off";
254261
};
255-
led@08.4 {
262+
led@8,4 {
256263
compatible = "register-bit-led";
264+
reg = <0x08 0x04>;
257265
offset = <0x08>;
258266
mask = <0x10>;
259267
label = "versatile:4";
260268
default-state = "off";
261269
};
262-
led@08.5 {
270+
led@8,5 {
263271
compatible = "register-bit-led";
272+
reg = <0x08 0x04>;
264273
offset = <0x08>;
265274
mask = <0x20>;
266275
label = "versatile:5";
267276
default-state = "off";
268277
};
269-
led@08.6 {
278+
led@8,6 {
270279
compatible = "register-bit-led";
280+
reg = <0x08 0x04>;
271281
offset = <0x08>;
272282
mask = <0x40>;
273283
label = "versatile:6";
274284
default-state = "off";
275285
};
276-
led@08.7 {
286+
led@8,7 {
277287
compatible = "register-bit-led";
288+
reg = <0x08 0x04>;
278289
offset = <0x08>;
279290
mask = <0x80>;
280291
label = "versatile:7";

‎arch/arm/boot/dts/integrator.dtsi

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@
1515
core-module@10000000 {
1616
compatible = "arm,core-module-integrator", "syscon", "simple-mfd";
1717
reg = <0x10000000 0x200>;
18+
ranges = <0x0 0x10000000 0x200>;
19+
#address-cells = <1>;
20+
#size-cells = <1>;
1821

1922
/* Use core module LED to indicate CPU load */
20-
led@c.0 {
23+
led@c,0 {
2124
compatible = "register-bit-led";
25+
reg = <0x0c 0x04>;
2226
offset = <0x0c>;
2327
mask = <0x01>;
2428
label = "integrator:core_module";
@@ -104,35 +108,42 @@
104108
interrupts = <4>;
105109
};
106110

107-
syscon {
111+
syscon@1a000000 {
108112
/* Debug registers mapped as syscon */
109113
compatible = "syscon", "simple-mfd";
110114
reg = <0x1a000000 0x10>;
115+
ranges = <0x0 0x1a000000 0x10>;
116+
#address-cells = <1>;
117+
#size-cells = <1>;
111118

112-
led@4.0 {
119+
led@4,0 {
113120
compatible = "register-bit-led";
121+
reg = <0x04 0x04>;
114122
offset = <0x04>;
115123
mask = <0x01>;
116124
label = "integrator:green0";
117125
linux,default-trigger = "heartbeat";
118126
default-state = "on";
119127
};
120-
led@4.1 {
128+
led@4,1 {
121129
compatible = "register-bit-led";
130+
reg = <0x04 0x04>;
122131
offset = <0x04>;
123132
mask = <0x02>;
124133
label = "integrator:yellow";
125134
default-state = "off";
126135
};
127-
led@4.2 {
136+
led@4,2 {
128137
compatible = "register-bit-led";
138+
reg = <0x04 0x04>;
129139
offset = <0x04>;
130140
mask = <0x04>;
131141
label = "integrator:red";
132142
default-state = "off";
133143
};
134-
led@4.3 {
144+
led@4,3 {
135145
compatible = "register-bit-led";
146+
reg = <0x04 0x04>;
136147
offset = <0x04>;
137148
mask = <0x08>;
138149
label = "integrator:green1";

0 commit comments

Comments
 (0)