Commit 1dabb749 authored by Johan Jonker's avatar Johan Jonker Committed by Heiko Stuebner
Browse files

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: default avatarJohan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20220603163539.537-3-jbx6244@gmail.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent d28b680a

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

+10 −6
Original line number Diff line number Diff line
@@ -15,18 +15,22 @@ 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 {

	status = "okay";

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

+10 −6
Original line number Diff line number Diff line
@@ -80,18 +80,22 @@ &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 {

	status = "okay";

arch/arm/boot/dts/rk3036.dtsi

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

+10 −7
Original line number Diff line number Diff line
@@ -150,13 +150,15 @@ 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>;
@@ -164,6 +166,7 @@ phy0: ethernet-phy@0 { 
			interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;

		};

	};

};



&mmc0 {

	status = "okay";

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

+10 −5
Original line number Diff line number Diff line
@@ -142,17 +142,22 @@ &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 {

	bus-width = <8>;