Unverified Commit b68ec116 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.1-rockchip-dts32-1' of... 

Merge tag 'v6.1-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Adapt emac nodes to make them conform to the newly yaml-converted binding.

* tag 'v6.1-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: restyle emac nodes
  ARM: dts: rockchip: fix rk3036 emac node compatible string

Link: https://lore.kernel.org/r/4766760.31r3eYUQgx@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b5a88262 1dabb749

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

+1 −3
Original line number Diff line number Diff line
@@ -225,11 +225,9 @@ usb_host: usb@101c0000 { 
	};



	emac: ethernet@10200000 {

		compatible = "rockchip,rk3036-emac", "snps,arc-emac";

		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>;