Skip to content

Commit db8ce24

Browse files
AaronDotchenhuacai
authored andcommitted
dt-bindings: interrupt-controller: loongson,liointc: Fix dtbs_check warning for interrupt-names
The Loongson-2K0500/2K1000 CPUs have 64 interrupt sources as inputs, and a route-mapped node handles up to 32 interrupt sources, so two liointc nodes are defined in dts{i}. Of course, we have to make sure that the routing outputs ("intx") of the two nodes do not conflict, i.e. "int0" can only be used as a routing output for one of them. Therefore, "interrupt-names" should be defined as "pattern". In addition, since "interrupt-names" and "interrupts" are one-to-one correspondence, we pass it to get the corresponding interrupt number in the driver. Setting it to "required" does not break ABI, because it is already logically represented as "required". This fixes dtbs_check warning: DTC_CHK arch/loongarch/boot/dts/loongson-2k0500-ref.dtb arch/loongarch/boot/dts/loongson-2k0500-ref.dtb: interrupt-controller@1fe11440: interrupt-names:0: 'int0' was expected From schema: Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml arch/loongarch/boot/dts/loongson-2k0500-ref.dtb: interrupt-controller@1fe11440: Unevaluated properties are not allowed ('interrupt-names' was unexpected) From schema: Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml DTC_CHK arch/loongarch/boot/dts/loongson-2k1000-ref.dtb arch/loongarch/boot/dts/loongson-2k1000-ref.dtb: interrupt-controller@1fe01440: interrupt-names:0: 'int0' was expected From schema: Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml arch/loongarch/boot/dts/loongson-2k1000-ref.dtb: interrupt-controller@1fe01440: Unevaluated properties are not allowed ('interrupt-names' was unexpected) From schema: Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml Acked-by: Jiaxun Yang <[email protected]> Reviewed-by: Rob Herring <[email protected]> Signed-off-by: Binbin Zhou <[email protected]> Signed-off-by: Huacai Chen <[email protected]>
1 parent aaeebb3 commit db8ce24

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ properties:
5151
interrupt-names:
5252
description: List of names for the parent interrupts.
5353
items:
54-
- const: int0
55-
- const: int1
56-
- const: int2
57-
- const: int3
54+
pattern: int[0-3]
5855
minItems: 1
56+
maxItems: 4
5957

6058
'#interrupt-cells':
6159
const: 2
@@ -75,6 +73,7 @@ required:
7573
- compatible
7674
- reg
7775
- interrupts
76+
- interrupt-names
7877
- interrupt-controller
7978
- '#interrupt-cells'
8079
- loongson,parent_int_map

0 commit comments

Comments
 (0)