Skip to content

Commit 4f43974

Browse files
neuschaefermaddy-kerneldev
neuschaefer
authored and
maddy-kerneldev
committed
powerpc: dts: mpc8315erdb: Use IRQ_TYPE_* macros
This increases readability, because "0x8" isn't very descriptive. mpc8315erdb.dtb remains identical after this patch. Signed-off-by: J. Neuschäfer <j.ne@posteo.net> Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> Link: https://patch.msgid.link/20260303-mpc83xx-cleanup-v2-2-187d3a13effa@posteo.net
1 parent 38ce944 commit 4f43974

1 file changed

Lines changed: 59 additions & 52 deletions

File tree

‎arch/powerpc/boot/dts/mpc8315erdb.dts‎

Lines changed: 59 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#size-cells = <1>;
5151
compatible = "fsl,mpc8315-elbc", "fsl,elbc", "simple-bus";
5252
reg = <0xe0005000 0x1000>;
53-
interrupts = <77 0x8>;
53+
interrupts = <77 IRQ_TYPE_LEVEL_LOW>;
5454
interrupt-parent = <&ipic>;
5555

5656
// CS0 and CS1 are swapped when
@@ -112,7 +112,7 @@
112112
cell-index = <0>;
113113
compatible = "fsl-i2c";
114114
reg = <0x3000 0x100>;
115-
interrupts = <14 0x8>;
115+
interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
116116
interrupt-parent = <&ipic>;
117117
dfsrr;
118118
rtc@68 {
@@ -133,7 +133,7 @@
133133
cell-index = <0>;
134134
compatible = "fsl,spi";
135135
reg = <0x7000 0x1000>;
136-
interrupts = <16 0x8>;
136+
interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
137137
interrupt-parent = <&ipic>;
138138
mode = "cpu";
139139
};
@@ -145,35 +145,35 @@
145145
reg = <0x82a8 4>;
146146
ranges = <0 0x8100 0x1a8>;
147147
interrupt-parent = <&ipic>;
148-
interrupts = <71 8>;
148+
interrupts = <71 IRQ_TYPE_LEVEL_LOW>;
149149
cell-index = <0>;
150150
dma-channel@0 {
151151
compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
152152
reg = <0 0x80>;
153153
cell-index = <0>;
154154
interrupt-parent = <&ipic>;
155-
interrupts = <71 8>;
155+
interrupts = <71 IRQ_TYPE_LEVEL_LOW>;
156156
};
157157
dma-channel@80 {
158158
compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
159159
reg = <0x80 0x80>;
160160
cell-index = <1>;
161161
interrupt-parent = <&ipic>;
162-
interrupts = <71 8>;
162+
interrupts = <71 IRQ_TYPE_LEVEL_LOW>;
163163
};
164164
dma-channel@100 {
165165
compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
166166
reg = <0x100 0x80>;
167167
cell-index = <2>;
168168
interrupt-parent = <&ipic>;
169-
interrupts = <71 8>;
169+
interrupts = <71 IRQ_TYPE_LEVEL_LOW>;
170170
};
171171
dma-channel@180 {
172172
compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
173173
reg = <0x180 0x28>;
174174
cell-index = <3>;
175175
interrupt-parent = <&ipic>;
176-
interrupts = <71 8>;
176+
interrupts = <71 IRQ_TYPE_LEVEL_LOW>;
177177
};
178178
};
179179

@@ -183,7 +183,7 @@
183183
#address-cells = <1>;
184184
#size-cells = <0>;
185185
interrupt-parent = <&ipic>;
186-
interrupts = <38 0x8>;
186+
interrupts = <38 IRQ_TYPE_LEVEL_LOW>;
187187
phy_type = "utmi";
188188
};
189189

@@ -197,7 +197,9 @@
197197
reg = <0x24000 0x1000>;
198198
ranges = <0x0 0x24000 0x1000>;
199199
local-mac-address = [ 00 00 00 00 00 00 ];
200-
interrupts = <32 0x8 33 0x8 34 0x8>;
200+
interrupts = <32 IRQ_TYPE_LEVEL_LOW>,
201+
<33 IRQ_TYPE_LEVEL_LOW>,
202+
<34 IRQ_TYPE_LEVEL_LOW>;
201203
interrupt-parent = <&ipic>;
202204
tbi-handle = <&tbi0>;
203205
phy-handle = < &phy0 >;
@@ -238,7 +240,9 @@
238240
reg = <0x25000 0x1000>;
239241
ranges = <0x0 0x25000 0x1000>;
240242
local-mac-address = [ 00 00 00 00 00 00 ];
241-
interrupts = <35 0x8 36 0x8 37 0x8>;
243+
interrupts = <35 IRQ_TYPE_LEVEL_LOW>,
244+
<36 IRQ_TYPE_LEVEL_LOW>,
245+
<37 IRQ_TYPE_LEVEL_LOW>;
242246
interrupt-parent = <&ipic>;
243247
tbi-handle = <&tbi1>;
244248
phy-handle = < &phy1 >;
@@ -263,7 +267,7 @@
263267
compatible = "fsl,ns16550", "ns16550";
264268
reg = <0x4500 0x100>;
265269
clock-frequency = <133333333>;
266-
interrupts = <9 0x8>;
270+
interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
267271
interrupt-parent = <&ipic>;
268272
};
269273

@@ -273,7 +277,7 @@
273277
compatible = "fsl,ns16550", "ns16550";
274278
reg = <0x4600 0x100>;
275279
clock-frequency = <133333333>;
276-
interrupts = <10 0x8>;
280+
interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
277281
interrupt-parent = <&ipic>;
278282
};
279283

@@ -282,7 +286,7 @@
282286
"fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1",
283287
"fsl,sec2.0";
284288
reg = <0x30000 0x10000>;
285-
interrupts = <11 0x8>;
289+
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
286290
interrupt-parent = <&ipic>;
287291
fsl,num-channels = <4>;
288292
fsl,channel-fifo-len = <24>;
@@ -294,39 +298,42 @@
294298
compatible = "fsl,mpc8315-sata", "fsl,pq-sata";
295299
reg = <0x18000 0x1000>;
296300
cell-index = <1>;
297-
interrupts = <44 0x8>;
301+
interrupts = <44 IRQ_TYPE_LEVEL_LOW>;
298302
interrupt-parent = <&ipic>;
299303
};
300304

301305
sata@19000 {
302306
compatible = "fsl,mpc8315-sata", "fsl,pq-sata";
303307
reg = <0x19000 0x1000>;
304308
cell-index = <2>;
305-
interrupts = <45 0x8>;
309+
interrupts = <45 IRQ_TYPE_LEVEL_LOW>;
306310
interrupt-parent = <&ipic>;
307311
};
308312

309313
gtm1: timer@500 {
310314
compatible = "fsl,mpc8315-gtm", "fsl,gtm";
311315
reg = <0x500 0x100>;
312-
interrupts = <90 8 78 8 84 8 72 8>;
316+
interrupts = <90 IRQ_TYPE_LEVEL_LOW>,
317+
<78 IRQ_TYPE_LEVEL_LOW>,
318+
<84 IRQ_TYPE_LEVEL_LOW>,
319+
<72 IRQ_TYPE_LEVEL_LOW>;
313320
interrupt-parent = <&ipic>;
314321
clock-frequency = <133333333>;
315322
};
316323

317324
timer@600 {
318325
compatible = "fsl,mpc8315-gtm", "fsl,gtm";
319326
reg = <0x600 0x100>;
320-
interrupts = <91 8 79 8 85 8 73 8>;
327+
interrupts = <91 IRQ_TYPE_LEVEL_LOW>,
328+
<79 IRQ_TYPE_LEVEL_LOW>,
329+
<85 IRQ_TYPE_LEVEL_LOW>,
330+
<73 IRQ_TYPE_LEVEL_LOW>;
321331
interrupt-parent = <&ipic>;
322332
clock-frequency = <133333333>;
323333
};
324334

325335
/* IPIC
326-
* interrupts cell = <intr #, sense>
327-
* sense values match linux IORESOURCE_IRQ_* defines:
328-
* sense == 8: Level, low assertion
329-
* sense == 2: Edge, high-to-low change
336+
* interrupts cell = <intr #, type>
330337
*/
331338
ipic: interrupt-controller@700 {
332339
interrupt-controller;
@@ -340,22 +347,22 @@
340347
compatible = "fsl,ipic-msi";
341348
reg = <0x7c0 0x40>;
342349
msi-available-ranges = <0 0x100>;
343-
interrupts = <0x43 0x8
344-
0x4 0x8
345-
0x51 0x8
346-
0x52 0x8
347-
0x56 0x8
348-
0x57 0x8
349-
0x58 0x8
350-
0x59 0x8>;
350+
interrupts = <0x43 IRQ_TYPE_LEVEL_LOW
351+
0x4 IRQ_TYPE_LEVEL_LOW
352+
0x51 IRQ_TYPE_LEVEL_LOW
353+
0x52 IRQ_TYPE_LEVEL_LOW
354+
0x56 IRQ_TYPE_LEVEL_LOW
355+
0x57 IRQ_TYPE_LEVEL_LOW
356+
0x58 IRQ_TYPE_LEVEL_LOW
357+
0x59 IRQ_TYPE_LEVEL_LOW>;
351358
interrupt-parent = < &ipic >;
352359
};
353360

354361
pmc: power@b00 {
355362
compatible = "fsl,mpc8315-pmc", "fsl,mpc8313-pmc",
356363
"fsl,mpc8349-pmc";
357364
reg = <0xb00 0x100 0xa00 0x100>;
358-
interrupts = <80 8>;
365+
interrupts = <80 IRQ_TYPE_LEVEL_LOW>;
359366
interrupt-parent = <&ipic>;
360367
fsl,mpc8313-wakeup-timer = <&gtm1>;
361368
};
@@ -374,24 +381,24 @@
374381
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
375382
interrupt-map = <
376383
/* IDSEL 0x0E -mini PCI */
377-
0x7000 0x0 0x0 0x1 &ipic 18 0x8
378-
0x7000 0x0 0x0 0x2 &ipic 18 0x8
379-
0x7000 0x0 0x0 0x3 &ipic 18 0x8
380-
0x7000 0x0 0x0 0x4 &ipic 18 0x8
384+
0x7000 0x0 0x0 0x1 &ipic 18 IRQ_TYPE_LEVEL_LOW
385+
0x7000 0x0 0x0 0x2 &ipic 18 IRQ_TYPE_LEVEL_LOW
386+
0x7000 0x0 0x0 0x3 &ipic 18 IRQ_TYPE_LEVEL_LOW
387+
0x7000 0x0 0x0 0x4 &ipic 18 IRQ_TYPE_LEVEL_LOW
381388

382389
/* IDSEL 0x0F -mini PCI */
383-
0x7800 0x0 0x0 0x1 &ipic 17 0x8
384-
0x7800 0x0 0x0 0x2 &ipic 17 0x8
385-
0x7800 0x0 0x0 0x3 &ipic 17 0x8
386-
0x7800 0x0 0x0 0x4 &ipic 17 0x8
390+
0x7800 0x0 0x0 0x1 &ipic 17 IRQ_TYPE_LEVEL_LOW
391+
0x7800 0x0 0x0 0x2 &ipic 17 IRQ_TYPE_LEVEL_LOW
392+
0x7800 0x0 0x0 0x3 &ipic 17 IRQ_TYPE_LEVEL_LOW
393+
0x7800 0x0 0x0 0x4 &ipic 17 IRQ_TYPE_LEVEL_LOW
387394

388395
/* IDSEL 0x10 - PCI slot */
389-
0x8000 0x0 0x0 0x1 &ipic 48 0x8
390-
0x8000 0x0 0x0 0x2 &ipic 17 0x8
391-
0x8000 0x0 0x0 0x3 &ipic 48 0x8
392-
0x8000 0x0 0x0 0x4 &ipic 17 0x8>;
396+
0x8000 0x0 0x0 0x1 &ipic 48 IRQ_TYPE_LEVEL_LOW
397+
0x8000 0x0 0x0 0x2 &ipic 17 IRQ_TYPE_LEVEL_LOW
398+
0x8000 0x0 0x0 0x3 &ipic 48 IRQ_TYPE_LEVEL_LOW
399+
0x8000 0x0 0x0 0x4 &ipic 17 IRQ_TYPE_LEVEL_LOW>;
393400
interrupt-parent = <&ipic>;
394-
interrupts = <66 0x8>;
401+
interrupts = <66 IRQ_TYPE_LEVEL_LOW>;
395402
bus-range = <0x0 0x0>;
396403
ranges = <0x02000000 0 0x90000000 0x90000000 0 0x10000000
397404
0x42000000 0 0x80000000 0x80000000 0 0x10000000
@@ -417,10 +424,10 @@
417424
0x01000000 0 0x00000000 0xb1000000 0 0x00800000>;
418425
bus-range = <0 255>;
419426
interrupt-map-mask = <0xf800 0 0 7>;
420-
interrupt-map = <0 0 0 1 &ipic 1 8
421-
0 0 0 2 &ipic 1 8
422-
0 0 0 3 &ipic 1 8
423-
0 0 0 4 &ipic 1 8>;
427+
interrupt-map = <0 0 0 1 &ipic 1 IRQ_TYPE_LEVEL_LOW
428+
0 0 0 2 &ipic 1 IRQ_TYPE_LEVEL_LOW
429+
0 0 0 3 &ipic 1 IRQ_TYPE_LEVEL_LOW
430+
0 0 0 4 &ipic 1 IRQ_TYPE_LEVEL_LOW>;
424431
clock-frequency = <0>;
425432

426433
pcie@0 {
@@ -448,10 +455,10 @@
448455
0x01000000 0 0x00000000 0xd1000000 0 0x00800000>;
449456
bus-range = <0 255>;
450457
interrupt-map-mask = <0xf800 0 0 7>;
451-
interrupt-map = <0 0 0 1 &ipic 2 8
452-
0 0 0 2 &ipic 2 8
453-
0 0 0 3 &ipic 2 8
454-
0 0 0 4 &ipic 2 8>;
458+
interrupt-map = <0 0 0 1 &ipic 2 IRQ_TYPE_LEVEL_LOW
459+
0 0 0 2 &ipic 2 IRQ_TYPE_LEVEL_LOW
460+
0 0 0 3 &ipic 2 IRQ_TYPE_LEVEL_LOW
461+
0 0 0 4 &ipic 2 IRQ_TYPE_LEVEL_LOW>;
455462
clock-frequency = <0>;
456463

457464
pcie@0 {

0 commit comments

Comments
 (0)