From: Peng Fan <peng.fan@xxxxxxx> i.MX8ULP and i.MX93 actually has two interrupts for each gpio controller, one for Trustzone non-secure world, one for secure world. And i.MX93 is directly derived from i.MX8ULP, so make i.MX93 GPIO compatible with i.MX8ULP Signed-off-by: Peng Fan <peng.fan@xxxxxxx> --- .../devicetree/bindings/gpio/gpio-vf610.yaml | 27 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml b/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml index 7c2d152e8617..2593cc96fcbb 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml +++ b/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml @@ -20,15 +20,14 @@ description: | properties: compatible: oneOf: + - const: fsl,imx8ulp-gpio - const: fsl,vf610-gpio - items: - const: fsl,imx7ulp-gpio - const: fsl,vf610-gpio - items: - - enum: - - fsl,imx93-gpio - - fsl,imx8ulp-gpio - - const: fsl,imx7ulp-gpio + - const: fsl,imx93-gpio + - const: fsl,imx8ulp-gpio reg: description: The first reg tuple represents the PORT module, the second tuple @@ -36,7 +35,8 @@ properties: maxItems: 2 interrupts: - maxItems: 1 + minItems: 1 + maxItems: 2 interrupt-controller: true @@ -77,6 +77,23 @@ required: - "#gpio-cells" - gpio-controller +allOf: + - if: + properties: + compatible: + contains: + enum: + - fsl,vf610-gpio + - fsl,imx7ulp-gpio + then: + properties: + interrupts: + maxItems: 1 + else: + properties: + interrupts: + maxItems: 2 + additionalProperties: false examples: -- 2.37.1