ARM: dts: imx6qdl: move phy properties into phy device node

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts
index 52e3567d1859daa612709657fcd0805d9d30f03f..225cf6b7a7a4f511e2639bc82d8097c48f342546 100644 (file)
--- 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 ead7ba27e10532fdfe2c74c465a3394f9fd298a0..563bf9d44fe0d0fc6c1c18d133fe75feb79263fe 100644 (file)
--- 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 d526f01a2c520705c50d0fc582a00831e7b55531..ac34709e97413a9753677c1b383682582ef6d464 100644 (file)
--- 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 a0917823c244f86234f835ee6a3f25c103f26d7b..c96f4d7e1e0d89be4682a56541fa2af261b8d100 100644 (file)
--- 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 1243677b5f977fbff9ad7ef59d68fe3dd4cbb1d0..49da30d7510c4a56d0c2a717517883442c5f6772 100644 (file)
--- 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 fdc3aa9d544d3a98681dc6d9241eecc9752d6214..eb9a0b104f1c32c463d3c46a053c368fa9434842 100644 (file)
--- 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 {