tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: imx6: delete interrupts property if interrupts-extended is set

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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Alexander Stein and committed by
Shawn Guo c9d38ff7 8b212526

+11
+1
arch/arm/boot/dts/imx6dl-riotboard.dts
··· 90 90 pinctrl-0 = <&pinctrl_enet>; 91 91 phy-mode = "rgmii-id"; 92 92 phy-handle = <&rgmii_phy>; 93 + /delete-property/ interrupts; 93 94 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 94 95 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 95 96 fsl,err006687-workaround-present;
+1
arch/arm/boot/dts/imx6q-arm2.dts
··· 178 178 pinctrl-names = "default"; 179 179 pinctrl-0 = <&pinctrl_enet>; 180 180 phy-mode = "rgmii"; 181 + /delete-property/ interrupts; 181 182 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 182 183 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 183 184 fsl,err006687-workaround-present;
+1
arch/arm/boot/dts/imx6q-evi.dts
··· 146 146 pinctrl-0 = <&pinctrl_enet>; 147 147 phy-mode = "rgmii"; 148 148 phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; 149 + /delete-property/ interrupts; 149 150 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 150 151 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 151 152 fsl,err006687-workaround-present;
+1
arch/arm/boot/dts/imx6q-mccmon6.dts
··· 100 100 pinctrl-0 = <&pinctrl_enet>; 101 101 phy-mode = "rgmii"; 102 102 phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; 103 + /delete-property/ interrupts; 103 104 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 104 105 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 105 106 status = "okay";
+1
arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
··· 192 192 phy-mode = "rgmii"; 193 193 phy-handle = <&ethphy>; 194 194 phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; 195 + /delete-property/ interrupts; 195 196 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 196 197 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 197 198 fsl,err006687-workaround-present;
+1
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
··· 334 334 phy-mode = "rgmii"; 335 335 phy-handle = <&ethphy>; 336 336 phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; 337 + /delete-property/ interrupts; 337 338 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 338 339 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 339 340 fsl,err006687-workaround-present;
+1
arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
··· 263 263 pinctrl-names = "default"; 264 264 pinctrl-0 = <&pinctrl_enet>; 265 265 phy-mode = "rgmii"; 266 + /delete-property/ interrupts; 266 267 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 267 268 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 268 269 fsl,err006687-workaround-present;
+1
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
··· 267 267 phy-mode = "rgmii"; 268 268 phy-handle = <&ethphy>; 269 269 phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; 270 + /delete-property/ interrupts; 270 271 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 271 272 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 272 273 fsl,err006687-workaround-present;
+1
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
··· 295 295 pinctrl-names = "default"; 296 296 pinctrl-0 = <&pinctrl_enet>; 297 297 phy-mode = "rgmii-id"; 298 + /delete-property/ interrupts; 298 299 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 299 300 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 300 301 fsl,err006687-workaround-present;
+1
arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
··· 7 7 #include <dt-bindings/gpio/gpio.h> 8 8 9 9 &fec { 10 + /delete-property/ interrupts; 10 11 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 11 12 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 12 13 fsl,err006687-workaround-present;
+1
arch/arm/boot/dts/imx6qdl-ts7970.dtsi
··· 192 192 pinctrl-names = "default"; 193 193 pinctrl-0 = <&pinctrl_enet>; 194 194 phy-mode = "rgmii"; 195 + /delete-property/ interrupts; 195 196 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 196 197 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 197 198 fsl,err006687-workaround-present;