lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 768/862] ARM: dts: imx6: delete interrupts property if interrupts-extended is set
    Date
    From: Alexander Stein <alexander.stein@ew.tq-group.com>

    [ Upstream commit c9d38ff7080b2c4fa6786b82210fa13115895aae ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 @@
    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 @@
    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 @@
    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 @@
    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 @@
    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;
    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 @@
    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;
    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 @@
    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 @@
    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;
    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 @@
    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 @@
    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;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:33    [W:4.023 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site