| Message ID | 20220720064158.1413330-1-alexander.stein@ew.tq-group.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/1] ARM: dts: imx6: delete interrupts property if interrupts-extended is set | expand |
Hello Rob & Krzysztof, ping. Thanks and best regards Alexander Am Mittwoch, 20. Juli 2022, 08:41:58 CEST schrieb Alexander Stein: > In most cases this is related to fsl,err006687-workaround-present, which > requires a GPIO interrupt next a GIC interrupt. > > This fixes the dtbs_check warning: > imx6dl-mba6a.dtb: ethernet@2188000: More than one condition true in oneOf > schema: {'$filename': 'Documentation/devicetree/bindings/net/fsl,fec.yaml', > [...] > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> > --- > Given that all DT add interrupts-extended on the very next line, this > seems the correct thing to do. > > arch/arm/boot/dts/imx6dl-riotboard.dts | 1 + > arch/arm/boot/dts/imx6q-arm2.dts | 1 + > arch/arm/boot/dts/imx6q-evi.dts | 1 + > arch/arm/boot/dts/imx6q-mccmon6.dts | 1 + > arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 1 + > arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 + > arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 1 + > arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 + > arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + > arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 1 + > arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 1 + > 11 files changed, 11 insertions(+) > > diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts > b/arch/arm/boot/dts/imx6dl-riotboard.dts index e7d9bfbfd0e4..e7be05f205d3 > 100644 > --- a/arch/arm/boot/dts/imx6dl-riotboard.dts > +++ b/arch/arm/boot/dts/imx6dl-riotboard.dts > @@ -90,6 +90,7 @@ &fec { > pinctrl-0 = <&pinctrl_enet>; > phy-mode = "rgmii-id"; > phy-handle = <&rgmii_phy>; > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > fsl,err006687-workaround-present; > diff --git a/arch/arm/boot/dts/imx6q-arm2.dts > b/arch/arm/boot/dts/imx6q-arm2.dts index 0b40f52268b3..75586299d9ca 100644 > --- a/arch/arm/boot/dts/imx6q-arm2.dts > +++ b/arch/arm/boot/dts/imx6q-arm2.dts > @@ -178,6 +178,7 @@ &fec { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_enet>; > phy-mode = "rgmii"; > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > fsl,err006687-workaround-present; > diff --git a/arch/arm/boot/dts/imx6q-evi.dts > b/arch/arm/boot/dts/imx6q-evi.dts index c63f371ede8b..78d941fef5df 100644 > --- a/arch/arm/boot/dts/imx6q-evi.dts > +++ b/arch/arm/boot/dts/imx6q-evi.dts > @@ -146,6 +146,7 @@ &fec { > pinctrl-0 = <&pinctrl_enet>; > phy-mode = "rgmii"; > phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > fsl,err006687-workaround-present; > diff --git a/arch/arm/boot/dts/imx6q-mccmon6.dts > b/arch/arm/boot/dts/imx6q-mccmon6.dts index 55692c73943d..64ab01018b71 > 100644 > --- a/arch/arm/boot/dts/imx6q-mccmon6.dts > +++ b/arch/arm/boot/dts/imx6q-mccmon6.dts > @@ -100,6 +100,7 @@ &fec { > pinctrl-0 = <&pinctrl_enet>; > phy-mode = "rgmii"; > phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > status = "okay"; > diff --git a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi > b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi index 0ad4cb4f1e82..a53a5d0766a5 > 100644 > --- a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi > @@ -192,6 +192,7 @@ &fec { > phy-mode = "rgmii"; > phy-handle = <ðphy>; > phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > fsl,err006687-workaround-present; > diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi > b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi index > beaa2dcd436c..57c21a01f126 100644 > --- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi > @@ -334,6 +334,7 @@ &fec { > phy-mode = "rgmii"; > phy-handle = <ðphy>; > phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > fsl,err006687-workaround-present; > diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi > b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi index > ee7e2371f94b..000e9dc97b1a 100644 > --- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi > @@ -263,6 +263,7 @@ &fec { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_enet>; > phy-mode = "rgmii"; > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > fsl,err006687-workaround-present; > diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi > b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi index > 904d5d051d63..731759bdd7f5 100644 > --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi > @@ -267,6 +267,7 @@ &fec { > phy-mode = "rgmii"; > phy-handle = <ðphy>; > phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > fsl,err006687-workaround-present; > diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi > b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 1368a4762037..3dbb460ef102 > 100644 > --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi > @@ -295,6 +295,7 @@ &fec { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_enet>; > phy-mode = "rgmii-id"; > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > fsl,err006687-workaround-present; > diff --git a/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi > b/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi index 7dc3f0005b0f..0a36e1bce375 > 100644 > --- a/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi > @@ -7,6 +7,7 @@ > #include <dt-bindings/gpio/gpio.h> > > &fec { > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > fsl,err006687-workaround-present; > diff --git a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi > b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi index d6ba4b2a60f6..c096d25a6f5b > 100644 > --- a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi > @@ -192,6 +192,7 @@ &fec { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_enet>; > phy-mode = "rgmii"; > + /delete-property/ interrupts; > interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, > <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; > fsl,err006687-workaround-present;
On 15/08/2022 14:31, Alexander Stein wrote: > Hello Rob & Krzysztof, > > ping. As well here - nothing to do for us, why pinging? Best regards, Krzysztof
On Wed, Jul 20, 2022 at 08:41:58AM +0200, Alexander Stein wrote: > In most cases this is related to fsl,err006687-workaround-present, which > requires a GPIO interrupt next a GIC interrupt. > > This fixes the dtbs_check warning: > imx6dl-mba6a.dtb: ethernet@2188000: More than one condition true in oneOf schema: > {'$filename': 'Documentation/devicetree/bindings/net/fsl,fec.yaml', > [...] > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Applied, thanks!
diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts index e7d9bfbfd0e4..e7be05f205d3 100644 --- a/arch/arm/boot/dts/imx6dl-riotboard.dts +++ b/arch/arm/boot/dts/imx6dl-riotboard.dts @@ -90,6 +90,7 @@ &fec { pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii-id"; phy-handle = <&rgmii_phy>; + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts index 0b40f52268b3..75586299d9ca 100644 --- a/arch/arm/boot/dts/imx6q-arm2.dts +++ b/arch/arm/boot/dts/imx6q-arm2.dts @@ -178,6 +178,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts index c63f371ede8b..78d941fef5df 100644 --- a/arch/arm/boot/dts/imx6q-evi.dts +++ b/arch/arm/boot/dts/imx6q-evi.dts @@ -146,6 +146,7 @@ &fec { pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; diff --git a/arch/arm/boot/dts/imx6q-mccmon6.dts b/arch/arm/boot/dts/imx6q-mccmon6.dts index 55692c73943d..64ab01018b71 100644 --- a/arch/arm/boot/dts/imx6q-mccmon6.dts +++ b/arch/arm/boot/dts/imx6q-mccmon6.dts @@ -100,6 +100,7 @@ &fec { pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; status = "okay"; diff --git a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi index 0ad4cb4f1e82..a53a5d0766a5 100644 --- a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi @@ -192,6 +192,7 @@ &fec { phy-mode = "rgmii"; phy-handle = <ðphy>; phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi index beaa2dcd436c..57c21a01f126 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi @@ -334,6 +334,7 @@ &fec { phy-mode = "rgmii"; phy-handle = <ðphy>; phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi index ee7e2371f94b..000e9dc97b1a 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi @@ -263,6 +263,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi index 904d5d051d63..731759bdd7f5 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi @@ -267,6 +267,7 @@ &fec { phy-mode = "rgmii"; phy-handle = <ðphy>; phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 1368a4762037..3dbb460ef102 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -295,6 +295,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii-id"; + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; diff --git a/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi index 7dc3f0005b0f..0a36e1bce375 100644 --- a/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi @@ -7,6 +7,7 @@ #include <dt-bindings/gpio/gpio.h> &fec { + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; diff --git a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi index d6ba4b2a60f6..c096d25a6f5b 100644 --- a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi +++ b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi @@ -192,6 +192,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; + /delete-property/ interrupts; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present;
In most cases this is related to fsl,err006687-workaround-present, which requires a GPIO interrupt next a GIC interrupt. This fixes the dtbs_check warning: imx6dl-mba6a.dtb: ethernet@2188000: More than one condition true in oneOf schema: {'$filename': 'Documentation/devicetree/bindings/net/fsl,fec.yaml', [...] Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> --- Given that all DT add interrupts-extended on the very next line, this seems the correct thing to do. arch/arm/boot/dts/imx6dl-riotboard.dts | 1 + arch/arm/boot/dts/imx6q-arm2.dts | 1 + arch/arm/boot/dts/imx6q-evi.dts | 1 + arch/arm/boot/dts/imx6q-mccmon6.dts | 1 + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 1 + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 1 + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 1 + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 1 + 11 files changed, 11 insertions(+)