lkml.org 
[lkml]   [2021]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 2/2] ARM: dts: imx6qdl: move phy properties into phy device node
    Date
    This patch fixes issues found by dtbs_check:
    make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/net/fsl,fec.yaml

    According to the Micrel PHY dt-binding:
    Documentation/devicetree/bindings/net/micrel-ksz90x1.txt,
    Add clock delay in an Ethernet OF device node is deprecated, so move
    these properties to PHY OF device node.

    Suggested-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
    ---
    arch/arm/boot/dts/imx6q-novena.dts | 34 +++++++++++++-------
    arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 18 ++++++++---
    arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 34 +++++++++++++-------
    arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 34 +++++++++++++-------
    arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 34 +++++++++++++-------
    arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 34 +++++++++++++-------
    6 files changed, 124 insertions(+), 64 deletions(-)

    diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts
    index 52e3567d1859..225cf6b7a7a4 100644
    --- a/arch/arm/boot/dts/imx6q-novena.dts
    +++ b/arch/arm/boot/dts/imx6q-novena.dts
    @@ -222,20 +222,30 @@
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_enet_novena>;
    phy-mode = "rgmii";
    + phy-handle = <&ethphy>;
    phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
    - rxc-skew-ps = <3000>;
    - rxdv-skew-ps = <0>;
    - txc-skew-ps = <3000>;
    - txen-skew-ps = <0>;
    - rxd0-skew-ps = <0>;
    - rxd1-skew-ps = <0>;
    - rxd2-skew-ps = <0>;
    - rxd3-skew-ps = <0>;
    - txd0-skew-ps = <3000>;
    - txd1-skew-ps = <3000>;
    - txd2-skew-ps = <3000>;
    - txd3-skew-ps = <3000>;
    status = "okay";
    +
    + mdio {
    + #address-cells = <1>;
    + #size-cells = <0>;
    +
    + ethphy: ethernet-phy {
    + compatible = "ethernet-phy-ieee802.3-c22";
    + rxc-skew-ps = <3000>;
    + rxdv-skew-ps = <0>;
    + txc-skew-ps = <3000>;
    + txen-skew-ps = <0>;
    + rxd0-skew-ps = <0>;
    + rxd1-skew-ps = <0>;
    + rxd2-skew-ps = <0>;
    + rxd3-skew-ps = <0>;
    + txd0-skew-ps = <3000>;
    + txd1-skew-ps = <3000>;
    + txd2-skew-ps = <3000>;
    + txd3-skew-ps = <3000>;
    + };
    + };
    };

    &hdmi {
    diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
    index ead7ba27e105..563bf9d44fe0 100644
    --- a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
    +++ b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
    @@ -316,12 +316,22 @@
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_enet>;
    phy-mode = "rgmii";
    + phy-handle = <&ethphy>;
    phy-reset-gpios = <&gpio7 18 GPIO_ACTIVE_LOW>;
    - txd0-skew-ps = <0>;
    - txd1-skew-ps = <0>;
    - txd2-skew-ps = <0>;
    - txd3-skew-ps = <0>;
    status = "okay";
    +
    + mdio {
    + #address-cells = <1>;
    + #size-cells = <0>;
    +
    + ethphy: ethernet-phy {
    + compatible = "ethernet-phy-ieee802.3-c22";
    + txd0-skew-ps = <0>;
    + txd1-skew-ps = <0>;
    + txd2-skew-ps = <0>;
    + txd3-skew-ps = <0>;
    + };
    + };
    };

    &gpmi {
    diff --git a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
    index d526f01a2c52..ac34709e9741 100644
    --- a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
    +++ b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
    @@ -190,23 +190,33 @@
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_enet>;
    phy-mode = "rgmii";
    + phy-handle = <&ethphy>;
    phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
    - txen-skew-ps = <0>;
    - txc-skew-ps = <3000>;
    - rxdv-skew-ps = <0>;
    - rxc-skew-ps = <3000>;
    - rxd0-skew-ps = <0>;
    - rxd1-skew-ps = <0>;
    - rxd2-skew-ps = <0>;
    - rxd3-skew-ps = <0>;
    - txd0-skew-ps = <0>;
    - txd1-skew-ps = <0>;
    - txd2-skew-ps = <0>;
    - txd3-skew-ps = <0>;
    interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
    <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
    fsl,err006687-workaround-present;
    status = "okay";
    +
    + mdio {
    + #address-cells = <1>;
    + #size-cells = <0>;
    +
    + ethphy: ethernet-phy {
    + compatible = "ethernet-phy-ieee802.3-c22";
    + txen-skew-ps = <0>;
    + txc-skew-ps = <3000>;
    + rxdv-skew-ps = <0>;
    + rxc-skew-ps = <3000>;
    + rxd0-skew-ps = <0>;
    + rxd1-skew-ps = <0>;
    + rxd2-skew-ps = <0>;
    + rxd3-skew-ps = <0>;
    + txd0-skew-ps = <0>;
    + txd1-skew-ps = <0>;
    + txd2-skew-ps = <0>;
    + txd3-skew-ps = <0>;
    + };
    + };
    };

    &hdmi {
    diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
    index a0917823c244..c96f4d7e1e0d 100644
    --- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
    +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
    @@ -332,23 +332,33 @@
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_enet>;
    phy-mode = "rgmii";
    + phy-handle = <&ethphy>;
    phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
    - txen-skew-ps = <0>;
    - txc-skew-ps = <3000>;
    - rxdv-skew-ps = <0>;
    - rxc-skew-ps = <3000>;
    - rxd0-skew-ps = <0>;
    - rxd1-skew-ps = <0>;
    - rxd2-skew-ps = <0>;
    - rxd3-skew-ps = <0>;
    - txd0-skew-ps = <0>;
    - txd1-skew-ps = <0>;
    - txd2-skew-ps = <0>;
    - txd3-skew-ps = <0>;
    interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
    <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
    fsl,err006687-workaround-present;
    status = "okay";
    +
    + mdio {
    + #address-cells = <1>;
    + #size-cells = <0>;
    +
    + ethphy: ethernet-phy {
    + compatible = "ethernet-phy-ieee802.3-c22";
    + txen-skew-ps = <0>;
    + txc-skew-ps = <3000>;
    + rxdv-skew-ps = <0>;
    + rxc-skew-ps = <3000>;
    + rxd0-skew-ps = <0>;
    + rxd1-skew-ps = <0>;
    + rxd2-skew-ps = <0>;
    + rxd3-skew-ps = <0>;
    + txd0-skew-ps = <0>;
    + txd1-skew-ps = <0>;
    + txd2-skew-ps = <0>;
    + txd3-skew-ps = <0>;
    + };
    + };
    };

    &hdmi {
    diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
    index 1243677b5f97..49da30d7510c 100644
    --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
    +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
    @@ -265,23 +265,33 @@
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_enet>;
    phy-mode = "rgmii";
    + phy-handle = <&ethphy>;
    phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
    - txen-skew-ps = <0>;
    - txc-skew-ps = <3000>;
    - rxdv-skew-ps = <0>;
    - rxc-skew-ps = <3000>;
    - rxd0-skew-ps = <0>;
    - rxd1-skew-ps = <0>;
    - rxd2-skew-ps = <0>;
    - rxd3-skew-ps = <0>;
    - txd0-skew-ps = <0>;
    - txd1-skew-ps = <0>;
    - txd2-skew-ps = <0>;
    - txd3-skew-ps = <0>;
    interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
    <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
    fsl,err006687-workaround-present;
    status = "okay";
    +
    + mdio {
    + #address-cells = <1>;
    + #size-cells = <0>;
    +
    + ethphy: ethernet-phy {
    + compatible = "ethernet-phy-ieee802.3-c22";
    + txen-skew-ps = <0>;
    + txc-skew-ps = <3000>;
    + rxdv-skew-ps = <0>;
    + rxc-skew-ps = <3000>;
    + rxd0-skew-ps = <0>;
    + rxd1-skew-ps = <0>;
    + rxd2-skew-ps = <0>;
    + rxd3-skew-ps = <0>;
    + txd0-skew-ps = <0>;
    + txd1-skew-ps = <0>;
    + txd2-skew-ps = <0>;
    + txd3-skew-ps = <0>;
    + };
    + };
    };

    &hdmi {
    diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
    index fdc3aa9d544d..eb9a0b104f1c 100644
    --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
    +++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
    @@ -324,20 +324,30 @@
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_enet>;
    phy-mode = "rgmii";
    + phy-handle = <&ethphy>;
    phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
    - txen-skew-ps = <0>;
    - txc-skew-ps = <3000>;
    - rxdv-skew-ps = <0>;
    - rxc-skew-ps = <3000>;
    - rxd0-skew-ps = <0>;
    - rxd1-skew-ps = <0>;
    - rxd2-skew-ps = <0>;
    - rxd3-skew-ps = <0>;
    - txd0-skew-ps = <0>;
    - txd1-skew-ps = <0>;
    - txd2-skew-ps = <0>;
    - txd3-skew-ps = <0>;
    status = "okay";
    +
    + mdio {
    + #address-cells = <1>;
    + #size-cells = <0>;
    +
    + ethphy: ethernet-phy {
    + compatible = "ethernet-phy-ieee802.3-c22";
    + txen-skew-ps = <0>;
    + txc-skew-ps = <3000>;
    + rxdv-skew-ps = <0>;
    + rxc-skew-ps = <3000>;
    + rxd0-skew-ps = <0>;
    + rxd1-skew-ps = <0>;
    + rxd2-skew-ps = <0>;
    + rxd3-skew-ps = <0>;
    + txd0-skew-ps = <0>;
    + txd1-skew-ps = <0>;
    + txd2-skew-ps = <0>;
    + txd3-skew-ps = <0>;
    + };
    + };
    };

    &hdmi {
    --
    2.17.1
    \
     
     \ /
      Last update: 2021-07-21 12:23    [W:3.240 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site