Skip to content

Commit 762cf75

Browse files
ziyao233chenhuacai
authored andcommitted
LoongArch: dts: Describe PCI sideband IRQ through interrupt-extended
SoC integrated peripherals on LS2K1000 and LS2K2000 could be discovered as PCI devices, but require sideband interrupts to function, which are previously described by interrupts and interrupt-parent properties. However, pci/pci-device.yaml allows interrupts property to only specify PCI INTx interrupts, not sideband ones. Convert these devices to use interrupt-extended property, which describes sideband interrupts used by PCI devices since dt-schema commit e6ea659d2baa ("schemas: pci-device: Allow interrupts-extended for sideband interrupts"), eliminating dtbs_check warnings. Cc: stable@vger.kernel.org Fixes: 30a5532 ("LoongArch: dts: DeviceTree for Loongson-2K1000") Signed-off-by: Yao Zi <me@ziyao.cc> Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
1 parent a91f86e commit 762cf75

2 files changed

Lines changed: 21 additions & 36 deletions

File tree

arch/loongarch/boot/dts/loongson-2k1000.dtsi

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -437,54 +437,47 @@
437437

438438
gmac0: ethernet@3,0 {
439439
reg = <0x1800 0x0 0x0 0x0 0x0>;
440-
interrupt-parent = <&liointc0>;
441-
interrupts = <12 IRQ_TYPE_LEVEL_HIGH>,
442-
<13 IRQ_TYPE_LEVEL_HIGH>;
440+
interrupts-extended = <&liointc0 12 IRQ_TYPE_LEVEL_HIGH>,
441+
<&liointc0 13 IRQ_TYPE_LEVEL_HIGH>;
443442
interrupt-names = "macirq", "eth_lpi";
444443
status = "disabled";
445444
};
446445

447446
gmac1: ethernet@3,1 {
448447
reg = <0x1900 0x0 0x0 0x0 0x0>;
449-
interrupt-parent = <&liointc0>;
450-
interrupts = <14 IRQ_TYPE_LEVEL_HIGH>,
451-
<15 IRQ_TYPE_LEVEL_HIGH>;
448+
interrupts-extended = <&liointc0 14 IRQ_TYPE_LEVEL_HIGH>,
449+
<&liointc0 15 IRQ_TYPE_LEVEL_HIGH>;
452450
interrupt-names = "macirq", "eth_lpi";
453451
status = "disabled";
454452
};
455453

456454
ehci0: usb@4,1 {
457455
reg = <0x2100 0x0 0x0 0x0 0x0>;
458-
interrupt-parent = <&liointc1>;
459-
interrupts = <18 IRQ_TYPE_LEVEL_HIGH>;
456+
interrupts-extended = <&liointc1 18 IRQ_TYPE_LEVEL_HIGH>;
460457
status = "disabled";
461458
};
462459

463460
ohci0: usb@4,2 {
464461
reg = <0x2200 0x0 0x0 0x0 0x0>;
465-
interrupt-parent = <&liointc1>;
466-
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
462+
interrupts-extended = <&liointc1 19 IRQ_TYPE_LEVEL_HIGH>;
467463
status = "disabled";
468464
};
469465

470466
display@6,0 {
471467
reg = <0x3000 0x0 0x0 0x0 0x0>;
472-
interrupt-parent = <&liointc0>;
473-
interrupts = <28 IRQ_TYPE_LEVEL_HIGH>;
468+
interrupts-extended = <&liointc0 28 IRQ_TYPE_LEVEL_HIGH>;
474469
status = "disabled";
475470
};
476471

477472
hda@7,0 {
478473
reg = <0x3800 0x0 0x0 0x0 0x0>;
479-
interrupt-parent = <&liointc0>;
480-
interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
474+
interrupts-extended = <&liointc0 4 IRQ_TYPE_LEVEL_HIGH>;
481475
status = "disabled";
482476
};
483477

484478
sata: sata@8,0 {
485479
reg = <0x4000 0x0 0x0 0x0 0x0>;
486-
interrupt-parent = <&liointc0>;
487-
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
480+
interrupts-extended = <&liointc0 19 IRQ_TYPE_LEVEL_HIGH>;
488481
status = "disabled";
489482
};
490483

arch/loongarch/boot/dts/loongson-2k2000.dtsi

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -291,65 +291,57 @@
291291

292292
gmac0: ethernet@3,0 {
293293
reg = <0x1800 0x0 0x0 0x0 0x0>;
294-
interrupts = <12 IRQ_TYPE_LEVEL_HIGH>,
295-
<13 IRQ_TYPE_LEVEL_HIGH>;
294+
interrupts-extended = <&pic 12 IRQ_TYPE_LEVEL_HIGH>,
295+
<&pic 13 IRQ_TYPE_LEVEL_HIGH>;
296296
interrupt-names = "macirq", "eth_lpi";
297-
interrupt-parent = <&pic>;
298297
status = "disabled";
299298
};
300299

301300
gmac1: ethernet@3,1 {
302301
reg = <0x1900 0x0 0x0 0x0 0x0>;
303-
interrupts = <14 IRQ_TYPE_LEVEL_HIGH>,
304-
<15 IRQ_TYPE_LEVEL_HIGH>;
302+
interrupts-extended = <&pic 14 IRQ_TYPE_LEVEL_HIGH>,
303+
<&pic 15 IRQ_TYPE_LEVEL_HIGH>;
305304
interrupt-names = "macirq", "eth_lpi";
306-
interrupt-parent = <&pic>;
307305
status = "disabled";
308306
};
309307

310308
gmac2: ethernet@3,2 {
311309
reg = <0x1a00 0x0 0x0 0x0 0x0>;
312-
interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,
313-
<18 IRQ_TYPE_LEVEL_HIGH>;
310+
interrupts-extended = <&pic 17 IRQ_TYPE_LEVEL_HIGH>,
311+
<&pic 18 IRQ_TYPE_LEVEL_HIGH>;
314312
interrupt-names = "macirq", "eth_lpi";
315-
interrupt-parent = <&pic>;
316313
status = "disabled";
317314
};
318315

319316
xhci0: usb@4,0 {
320317
reg = <0x2000 0x0 0x0 0x0 0x0>;
321-
interrupts = <48 IRQ_TYPE_LEVEL_HIGH>;
322-
interrupt-parent = <&pic>;
318+
interrupts-extended = <&pic 48 IRQ_TYPE_LEVEL_HIGH>;
323319
status = "disabled";
324320
};
325321

326322
xhci1: usb@19,0 {
327323
reg = <0xc800 0x0 0x0 0x0 0x0>;
328-
interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;
329-
interrupt-parent = <&pic>;
324+
interrupts-extended = <&pic 22 IRQ_TYPE_LEVEL_HIGH>;
330325
status = "disabled";
331326
};
332327

333328
display@6,1 {
334329
reg = <0x3100 0x0 0x0 0x0 0x0>;
335-
interrupts = <28 IRQ_TYPE_LEVEL_HIGH>;
336-
interrupt-parent = <&pic>;
330+
interrupts-extended = <&pic 28 IRQ_TYPE_LEVEL_HIGH>;
337331
status = "disabled";
338332
};
339333

340334
i2s@7,0 {
341335
reg = <0x3800 0x0 0x0 0x0 0x0>;
342-
interrupts = <78 IRQ_TYPE_LEVEL_HIGH>,
343-
<79 IRQ_TYPE_LEVEL_HIGH>;
336+
interrupts-extended = <&pic 78 IRQ_TYPE_LEVEL_HIGH>,
337+
<&pic 79 IRQ_TYPE_LEVEL_HIGH>;
344338
interrupt-names = "tx", "rx";
345-
interrupt-parent = <&pic>;
346339
status = "disabled";
347340
};
348341

349342
sata: sata@8,0 {
350343
reg = <0x4000 0x0 0x0 0x0 0x0>;
351-
interrupts = <16 IRQ_TYPE_LEVEL_HIGH>;
352-
interrupt-parent = <&pic>;
344+
interrupts-extended = <&pic 16 IRQ_TYPE_LEVEL_HIGH>;
353345
status = "disabled";
354346
};
355347

0 commit comments

Comments
 (0)