Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4904337f authored by Corentin Labbe's avatar Corentin Labbe Committed by Maxime Ripard
Browse files

ARM: dts: sunxi: Restore EMAC changes (boards) 



The original dwmac-sun8i DT bindings have some issue on how to handle
integrated PHY and was reverted in last RC of 4.13.
But now we have a solution so we need to get back that was reverted.

This patch restore all boards DT about dwmac-sun8i
This reverts partially commit fe45174b ("arm: dts: sunxi: Revert EMAC changes")

Signed-off-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 776245ae

arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts

+9 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 


	aliases {

		serial0 = &uart0;

		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */

		ethernet0 = &emac;

		ethernet1 = &xr819;

	};
@@ -102,6 +104,13 @@ 
	status = "okay";

};



&emac {

	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>;

arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts

+19 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
	compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial1 = &uart1;

	};
@@ -111,6 +112,24 @@ 
	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_rgmii_pins>;

	phy-supply = <&reg_gmac_3v3>;

	phy-handle = <&ext_rgmii_phy>;

	phy-mode = "rgmii";



	allwinner,leds-active-low;

	status = "okay";

};



&external_mdio {

	ext_rgmii_phy: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <0>;

	};

};



&ir {

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;

arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts

+29 −0
Original line number Diff line number Diff line
@@ -51,6 +51,16 @@ 
		ethernet1 = &sdio_wifi;

	};



	reg_gmac_3v3: gmac-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "gmac-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		startup-delay-us = <100000>;

		enable-active-high;

		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";
@@ -66,6 +76,25 @@ 
	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_rgmii_pins>;

	phy-supply = <&reg_gmac_3v3>;

	phy-handle = <&ext_rgmii_phy>;

	phy-mode = "rgmii";



	allwinner,leds-active-low;



	status = "okay";

};



&external_mdio {

	ext_rgmii_phy: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <7>;

	};

};



&ir {

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;

arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts

+7 −0
Original line number Diff line number Diff line
@@ -46,3 +46,10 @@ 
	model = "FriendlyARM NanoPi NEO";

	compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";

};



&emac {

	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};

arch/arm/boot/dts/sun8i-h3-orangepi-2.dts

+8 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
	aliases {

		serial0 = &uart0;

		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */

		ethernet0 = &emac;

		ethernet1 = &rtl8189;

	};
@@ -117,6 +118,13 @@ 
	status = "okay";

};



&emac {

	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};



&ir {

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;