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: 30a5532a3206 ("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>

diff --git a/arch/loongarch/boot/dts/loongson-2k1000.dtsi b/arch/loongarch/boot/dts/loongson-2k1000.dtsi
index 60ab425f793fe3108389dce7481cd94cfb97d374..eee06b84951c5717c5a2464c519480ef747653b8 100644 (file)
--- a/arch/loongarch/boot/dts/loongson-2k1000.dtsi
+++ b/arch/loongarch/boot/dts/loongson-2k1000.dtsi
@@ -437,54 +437,47 @@
 
                        gmac0: ethernet@3,0 {
                                reg = <0x1800 0x0 0x0 0x0 0x0>;
-                               interrupt-parent = <&liointc0>;
-                               interrupts = <12 IRQ_TYPE_LEVEL_HIGH>,
-                                            <13 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&liointc0 12 IRQ_TYPE_LEVEL_HIGH>,
+                                                     <&liointc0 13 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-names = "macirq", "eth_lpi";
                                status = "disabled";
                        };
 
                        gmac1: ethernet@3,1 {
                                reg = <0x1900 0x0 0x0 0x0 0x0>;
-                               interrupt-parent = <&liointc0>;
-                               interrupts = <14 IRQ_TYPE_LEVEL_HIGH>,
-                                            <15 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&liointc0 14 IRQ_TYPE_LEVEL_HIGH>,
+                                                     <&liointc0 15 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-names = "macirq", "eth_lpi";
                                status = "disabled";
                        };
 
                        ehci0: usb@4,1 {
                                reg = <0x2100 0x0 0x0 0x0 0x0>;
-                               interrupt-parent = <&liointc1>;
-                               interrupts = <18 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&liointc1 18 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
                        ohci0: usb@4,2 {
                                reg = <0x2200 0x0 0x0 0x0 0x0>;
-                               interrupt-parent = <&liointc1>;
-                               interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&liointc1 19 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
                        display@6,0 {
                                reg = <0x3000 0x0 0x0 0x0 0x0>;
-                               interrupt-parent = <&liointc0>;
-                               interrupts = <28 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&liointc0 28 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
                        hda@7,0 {
                                reg = <0x3800 0x0 0x0 0x0 0x0>;
-                               interrupt-parent = <&liointc0>;
-                               interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&liointc0 4 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
                        sata: sata@8,0 {
                                reg = <0x4000 0x0 0x0 0x0 0x0>;
-                               interrupt-parent = <&liointc0>;
-                               interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&liointc0 19 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 

diff --git a/arch/loongarch/boot/dts/loongson-2k2000.dtsi b/arch/loongarch/boot/dts/loongson-2k2000.dtsi
index 6c77b86ee06c8418b1e5edc23fe18894b7ca192c..87c45f1f7cc7a1e81f639f48206a8e52727bb6ed 100644 (file)
--- a/arch/loongarch/boot/dts/loongson-2k2000.dtsi
+++ b/arch/loongarch/boot/dts/loongson-2k2000.dtsi
@@ -291,65 +291,57 @@
 
                        gmac0: ethernet@3,0 {
                                reg = <0x1800 0x0 0x0 0x0 0x0>;
-                               interrupts = <12 IRQ_TYPE_LEVEL_HIGH>,
-                                            <13 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&pic 12 IRQ_TYPE_LEVEL_HIGH>,
+                                                     <&pic 13 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-names = "macirq", "eth_lpi";
-                               interrupt-parent = <&pic>;
                                status = "disabled";
                        };
 
                        gmac1: ethernet@3,1 {
                                reg = <0x1900 0x0 0x0 0x0 0x0>;
-                               interrupts = <14 IRQ_TYPE_LEVEL_HIGH>,
-                                            <15 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&pic 14 IRQ_TYPE_LEVEL_HIGH>,
+                                                     <&pic 15 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-names = "macirq", "eth_lpi";
-                               interrupt-parent = <&pic>;
                                status = "disabled";
                        };
 
                        gmac2: ethernet@3,2 {
                                reg = <0x1a00 0x0 0x0 0x0 0x0>;
-                               interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,
-                                            <18 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&pic 17 IRQ_TYPE_LEVEL_HIGH>,
+                                                     <&pic 18 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-names = "macirq", "eth_lpi";
-                               interrupt-parent = <&pic>;
                                status = "disabled";
                        };
 
                        xhci0: usb@4,0 {
                                reg = <0x2000 0x0 0x0 0x0 0x0>;
-                               interrupts = <48 IRQ_TYPE_LEVEL_HIGH>;
-                               interrupt-parent = <&pic>;
+                               interrupts-extended = <&pic 48 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
                        xhci1: usb@19,0 {
                                reg = <0xc800 0x0 0x0 0x0 0x0>;
-                               interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;
-                               interrupt-parent = <&pic>;
+                               interrupts-extended = <&pic 22 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
                        display@6,1 {
                                reg = <0x3100 0x0 0x0 0x0 0x0>;
-                               interrupts = <28 IRQ_TYPE_LEVEL_HIGH>;
-                               interrupt-parent = <&pic>;
+                               interrupts-extended = <&pic 28 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
                        i2s@7,0 {
                                reg = <0x3800 0x0 0x0 0x0 0x0>;
-                               interrupts = <78 IRQ_TYPE_LEVEL_HIGH>,
-                                            <79 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts-extended = <&pic 78 IRQ_TYPE_LEVEL_HIGH>,
+                                                     <&pic 79 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-names = "tx", "rx";
-                               interrupt-parent = <&pic>;
                                status = "disabled";
                        };
 
                        sata: sata@8,0 {
                                reg = <0x4000 0x0 0x0 0x0 0x0>;
-                               interrupts = <16 IRQ_TYPE_LEVEL_HIGH>;
-                               interrupt-parent = <&pic>;
+                               interrupts-extended = <&pic 16 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };