Commit c9d38ff7 authored by Alexander Stein's avatar Alexander Stein Committed by Shawn Guo
Browse files

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: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 8b212526

arch/arm/boot/dts/imx6dl-riotboard.dts

+1 −0
Original line number Diff line number Diff line
@@ -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;

arch/arm/boot/dts/imx6q-arm2.dts

+1 −0
Original line number Diff line number Diff line
@@ -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;

arch/arm/boot/dts/imx6q-evi.dts

+1 −0
Original line number Diff line number Diff line
@@ -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;

arch/arm/boot/dts/imx6q-mccmon6.dts

+1 −0
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ &fec { 
	phy-mode = "rgmii";

	phy-handle = <&ethphy>;

	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;