Skip to content

Commit

Permalink
ARM: dts: sunxi: Restore EMAC changes (boards)
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 all boards DT about dwmac-sun8i
This reverts partially commit fe45174 ("arm: dts: sunxi: 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
@montjoie @mripard
montjoie authored and mripard committed Nov 2, 2017
1 parent 776245a commit 4904337
Show file tree
Hide file tree
Showing 10 changed files with 131 additions and 0 deletions.
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
View file
Expand Up @@ -56,6 +56,8 @@

aliases {
serial0 = &uart0;
/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
ethernet0 = &emac;
ethernet1 = &xr819;
};

Expand Down Expand Up @@ -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>;
Expand Down
19 changes: 19 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
View file
Expand Up @@ -52,6 +52,7 @@
compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3";

aliases {
ethernet0 = &emac;
serial0 = &uart0;
serial1 = &uart1;
};
Expand Down Expand Up @@ -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>;
Expand Down
29 changes: 29 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
View file
Expand Up @@ -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";
Expand All @@ -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>;
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
View file
Expand Up @@ -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";
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
View file
Expand Up @@ -54,6 +54,7 @@
aliases {
serial0 = &uart0;
/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
ethernet0 = &emac;
ethernet1 = &rtl8189;
};

Expand Down Expand Up @@ -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>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
View file
Expand Up @@ -52,6 +52,7 @@
compatible = "xunlong,orangepi-one", "allwinner,sun8i-h3";

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

Expand Down Expand Up @@ -97,6 +98,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>, <&mmc0_cd_pin>;
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
View file
Expand Up @@ -53,6 +53,11 @@
};
};

&emac {
/* LEDs changed to active high on the plus */
/delete-property/ allwinner,leds-active-low;
};

&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
View file
Expand Up @@ -52,6 +52,7 @@
compatible = "xunlong,orangepi-pc", "allwinner,sun8i-h3";

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

Expand Down Expand Up @@ -113,6 +114,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>;
Expand Down
22 changes: 22 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
View file
Expand Up @@ -47,6 +47,10 @@
model = "Xunlong Orange Pi Plus / Plus 2";
compatible = "xunlong,orangepi-plus", "allwinner,sun8i-h3";

aliases {
ethernet0 = &emac;
};

reg_gmac_3v3: gmac-3v3 {
compatible = "regulator-fixed";
regulator-name = "gmac-3v3";
Expand Down Expand Up @@ -74,6 +78,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>;
};
};

&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_8bit_pins>;
Expand Down
16 changes: 16 additions & 0 deletions arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts
View file
Expand Up @@ -61,3 +61,19 @@
gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
};
};

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

0 comments on commit 4904337

Please sign in to comment.