diff mbox

[08/10] ARM: dts: sun7i: cubieboard2: Enable GMAC instead of EMAC

Message ID 1386350983-13281-9-git-send-email-wens@csie.org (mailing list archive)
State New, archived
Headers show

Commit Message

Chen-Yu Tsai Dec. 6, 2013, 5:29 p.m. UTC
GMAC has better performance and fewer hardware issues.
Use the GMAC in MII mode for ethernet instead of the EMAC.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

Comments

Florian Fainelli Dec. 6, 2013, 9:10 p.m. UTC | #1
2013/12/6 Chen-Yu Tsai <wens@csie.org>:
> GMAC has better performance and fewer hardware issues.
> Use the GMAC in MII mode for ethernet instead of the EMAC.
>
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>  arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 23 ++++++++---------------
>  1 file changed, 8 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> index 5c51cb8..9ef5848 100644
> --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> @@ -19,21 +19,6 @@
>         compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
>
>         soc@01c00000 {
> -               emac: ethernet@01c0b000 {
> -                       pinctrl-names = "default";
> -                       pinctrl-0 = <&emac_pins_a>;
> -                       phy = <&phy1>;
> -                       status = "okay";
> -               };
> -
> -               mdio@01c0b080 {
> -                       status = "okay";
> -
> -                       phy1: ethernet-phy@1 {
> -                               reg = <1>;
> -                       };
> -               };
> -
>                 pinctrl@01c20800 {
>                         led_pins_cubieboard2: led_pins@0 {
>                                 allwinner,pins = "PH20", "PH21";
> @@ -60,6 +45,14 @@
>                         pinctrl-0 = <&i2c1_pins_a>;
>                         status = "okay";
>                 };
> +
> +               gmac: ethernet@01c50000 {
> +                       pinctrl-names = "default";
> +                       pinctrl-0 = <&gmac_pins_mii>;
> +                       snps,phy-addr = <1>;

Same here, this is a custom property which has no reason to exist,
keep the existing ethernet PHY node please.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 5c51cb8..9ef5848 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -19,21 +19,6 @@ 
 	compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
 
 	soc@01c00000 {
-		emac: ethernet@01c0b000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&emac_pins_a>;
-			phy = <&phy1>;
-			status = "okay";
-		};
-
-		mdio@01c0b080 {
-			status = "okay";
-
-			phy1: ethernet-phy@1 {
-				reg = <1>;
-			};
-		};
-
 		pinctrl@01c20800 {
 			led_pins_cubieboard2: led_pins@0 {
 				allwinner,pins = "PH20", "PH21";
@@ -60,6 +45,14 @@ 
 			pinctrl-0 = <&i2c1_pins_a>;
 			status = "okay";
 		};
+
+		gmac: ethernet@01c50000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&gmac_pins_mii>;
+			snps,phy-addr = <1>;
+			phy-mode = "mii";
+			status = "okay";
+		};
 	};
 
 	leds {