ARM: dts: rockchip: restyle emac nodes

The emac_rockchip.txt file is converted to YAML.
Phy nodes are now a subnode of mdio, so restyle
the emac nodes of rk3036/rk3066/rk3188.
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20220603163539.537-3-jbx6244@gmail.comSigned-off-by: Heiko Stuebner <heiko@sntech.de>

arch/arm/boot/dts/rk3036-evb.dts

@@ -15,17 +15,21 @@ memory@60000000 {
 };
 
 &emac {
-	pinctrl-names = "default";
-	pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
 	phy = <&phy0>;
-	phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
 	phy-reset-duration = <10>; /* millisecond */
-
+	phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
+	pinctrl-names = "default";
+	pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
 	status = "okay";
 
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		phy0: ethernet-phy@0 {
 			reg = <0>;
 		};
+	};
 };
 
 &i2c1 {

arch/arm/boot/dts/rk3036-kylin.dts

@@ -80,17 +80,21 @@ &acodec {
 };
 
 &emac {
-	pinctrl-names = "default";
-	pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
 	phy = <&phy0>;
-	phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
 	phy-reset-duration = <10>; /* millisecond */
-
+	phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
+	pinctrl-names = "default";
+	pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
 	status = "okay";
 
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		phy0: ethernet-phy@0 {
 			reg = <0>;
 		};
+	};
 };
 
 &emmc {

arch/arm/boot/dts/rk3036.dtsi

@@ -228,8 +228,6 @@ emac: ethernet@10200000 {
 		compatible = "rockchip,rk3036-emac";
 		reg = <0x10200000 0x4000>;
 		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-		#address-cells = <1>;
-		#size-cells = <0>;
 		rockchip,grf = <&grf>;
 		clocks = <&cru HCLK_MAC>, <&cru SCLK_MACREF>, <&cru SCLK_MAC>;
 		clock-names = "hclk", "macref", "macclk";

arch/arm/boot/dts/rk3066a-marsboard.dts

@@ -150,19 +150,22 @@ vcc28_cif: regulator@12 {
 #include "tps65910.dtsi"
 
 &emac {
-	status = "okay";
-
 	phy = <&phy0>;
 	phy-supply = <&vcc_rmii>;
-
 	pinctrl-names = "default";
 	pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>;
+	status = "okay";
+
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
 
 		phy0: ethernet-phy@0 {
 			reg = <0>;
 			interrupt-parent = <&gpio1>;
 			interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;
 		};
+	};
 };
 
 &mmc0 {

arch/arm/boot/dts/rk3066a-rayeager.dts

@@ -142,16 +142,21 @@ &cpu1 {
 };
 
 &emac {
-	pinctrl-names = "default";
-	pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&rmii_rst>;
 	phy = <&phy0>;
 	phy-supply = <&vcc_rmii>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&rmii_rst>;
 	status = "okay";
 
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		phy0: ethernet-phy@0 {
 			reg = <0>;
 			reset-gpios = <&gpio1 RK_PD6 GPIO_ACTIVE_LOW>;
 		};
+	};
 };
 
 &emmc {

arch/arm/boot/dts/rk3188-radxarock.dts

@@ -126,19 +126,22 @@ vsys: vsys-regulator {
 };
 
 &emac {
-	status = "okay";
-
+	phy = <&phy0>;
+	phy-supply = <&vcc_rmii>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&phy_int>;
+	status = "okay";
 
-	phy = <&phy0>;
-	phy-supply = <&vcc_rmii>;
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
 
 		phy0: ethernet-phy@0 {
 			reg = <0>;
 			interrupt-parent = <&gpio3>;
 			interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;
 		};
+	};
 };
 
 &cpu0 {

arch/arm/boot/dts/rk3xxx.dtsi

@@ -186,8 +186,6 @@ emac: ethernet@10204000 {
 		compatible = "snps,arc-emac";
 		reg = <0x10204000 0x3c>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		rockchip,grf = <&grf>;