Skip to content

Commit

Permalink
arm64: dts: allwinner: H5: Restore EMAC changes
Browse files Browse the repository at this point in the history
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 arm64 DT about dwmac-sun8i for H5
This reverts a part of commit 87e1f5e ("arm64: dts: allwinner: Revert EMAC changes")

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  • Loading branch information
Corentin Labbe authored and Maxime Ripard committed Nov 2, 2017
1 parent 4904337 commit 44a94c7
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 0 deletions.
17 changes: 17 additions & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
compatible = "friendlyarm,nanopi-neo2", "allwinner,sun50i-h5";

aliases {
ethernet0 = &emac;
serial0 = &uart0;
};

Expand Down Expand Up @@ -108,6 +109,22 @@
status = "okay";
};

&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_rgmii_pins>;
phy-supply = <&reg_gmac_3v3>;
phy-handle = <&ext_rgmii_phy>;
phy-mode = "rgmii";
status = "okay";
};

&external_mdio {
ext_rgmii_phy: ethernet-phy@7 {
compatible = "ethernet-phy-ieee802.3-c22";
reg = <7>;
};
};

&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
Expand Down
17 changes: 17 additions & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
};

aliases {
ethernet0 = &emac;
serial0 = &uart0;
};

Expand Down Expand Up @@ -136,6 +137,22 @@
status = "okay";
};

&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_rgmii_pins>;
phy-supply = <&reg_gmac_3v3>;
phy-handle = <&ext_rgmii_phy>;
phy-mode = "rgmii";
status = "okay";
};

&external_mdio {
ext_rgmii_phy: ethernet-phy@1 {
compatible = "ethernet-phy-ieee802.3-c22";
reg = <1>;
};
};

&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;
Expand Down
17 changes: 17 additions & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
compatible = "xunlong,orangepi-prime", "allwinner,sun50i-h5";

aliases {
ethernet0 = &emac;
serial0 = &uart0;
};

Expand Down Expand Up @@ -143,6 +144,22 @@
status = "okay";
};

&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_rgmii_pins>;
phy-supply = <&reg_gmac_3v3>;
phy-handle = <&ext_rgmii_phy>;
phy-mode = "rgmii";
status = "okay";
};

&external_mdio {
ext_rgmii_phy: ethernet-phy@1 {
compatible = "ethernet-phy-ieee802.3-c22";
reg = <1>;
};
};

&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;
Expand Down

0 comments on commit 44a94c7

Please sign in to comment.