519 lines
18 KiB
Diff
519 lines
18 KiB
Diff
From 25ce28126444900b7b3efef36c6b9d15a6ab9af1 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Wed, 28 Oct 2020 10:08:44 +0000
|
|
Subject: [PATCH] Fixes for AllWinner ethernet network interfaces
|
|
|
|
The upstream kernel in fixing stuff has broken stuff.
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
---
|
|
arch/arm/dts/sun50i-a64-bananapi-m64.dts | 2 +-
|
|
arch/arm/dts/sun50i-a64-nanopi-a64.dts | 2 +-
|
|
arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts | 2 +-
|
|
arch/arm/dts/sun50i-a64-olinuxino.dts | 2 +-
|
|
arch/arm/dts/sun50i-a64-orangepi-win.dts | 2 +-
|
|
arch/arm/dts/sun50i-a64-pine64-plus.dts | 2 +-
|
|
arch/arm/dts/sun50i-a64-sopine-baseboard.dts | 2 +-
|
|
arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts | 2 +-
|
|
arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 2 +-
|
|
arch/arm/dts/sun50i-h5-nanopi-neo2.dts | 2 +-
|
|
arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 2 +-
|
|
arch/arm/dts/sun50i-h5-orangepi-prime.dts | 2 +-
|
|
arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts | 2 +-
|
|
arch/arm/dts/sun50i-h6-beelink-gs1.dts | 2 +-
|
|
arch/arm/dts/sun50i-h6-pine-h64.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-bananapi.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-bananapro.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-cubietruck.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-hummingbird.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-lamobo-r1.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-olimex-som-evb.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-olimex-som204-evb.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-olinuxino-lime2.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-orangepi-mini.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-orangepi.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-pcduino3-nano.dts | 2 +-
|
|
arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts | 2 +-
|
|
arch/arm/dts/sun8i-a83t-bananapi-m3.dts | 2 +-
|
|
arch/arm/dts/sun8i-a83t-cubietruck-plus.dts | 2 +-
|
|
arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts | 2 +-
|
|
arch/arm/dts/sun8i-h3-orangepi-plus.dts | 2 +-
|
|
arch/arm/dts/sun8i-h3-orangepi-plus2e.dts | 2 +-
|
|
arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts | 2 +-
|
|
arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +-
|
|
arch/arm/dts/sunxi-bananapi-m2-plus.dtsi | 2 +-
|
|
36 files changed, 36 insertions(+), 36 deletions(-)
|
|
|
|
diff --git a/arch/arm/dts/sun50i-a64-bananapi-m64.dts b/arch/arm/dts/sun50i-a64-bananapi-m64.dts
|
|
index ef1c90401b..e1c22aeb29 100644
|
|
--- a/arch/arm/dts/sun50i-a64-bananapi-m64.dts
|
|
+++ b/arch/arm/dts/sun50i-a64-bananapi-m64.dts
|
|
@@ -112,7 +112,7 @@
|
|
&emac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&rgmii_pins>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
phy-supply = <®_dc1sw>;
|
|
status = "okay";
|
|
diff --git a/arch/arm/dts/sun50i-a64-nanopi-a64.dts b/arch/arm/dts/sun50i-a64-nanopi-a64.dts
|
|
index 31884dbc88..03ebe3e44b 100644
|
|
--- a/arch/arm/dts/sun50i-a64-nanopi-a64.dts
|
|
+++ b/arch/arm/dts/sun50i-a64-nanopi-a64.dts
|
|
@@ -102,7 +102,7 @@
|
|
&emac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&rgmii_pins>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
phy-supply = <®_dcdc1>;
|
|
status = "okay";
|
|
diff --git a/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts b/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts
|
|
index 6a2154525d..94caf110ab 100644
|
|
--- a/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts
|
|
+++ b/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts
|
|
@@ -30,7 +30,7 @@
|
|
&emac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&rgmii_pins>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
phy-supply = <®_dc1sw>;
|
|
allwinner,tx-delay-ps = <600>;
|
|
diff --git a/arch/arm/dts/sun50i-a64-olinuxino.dts b/arch/arm/dts/sun50i-a64-olinuxino.dts
|
|
index f7a4bccaa5..2396d9b797 100644
|
|
--- a/arch/arm/dts/sun50i-a64-olinuxino.dts
|
|
+++ b/arch/arm/dts/sun50i-a64-olinuxino.dts
|
|
@@ -102,7 +102,7 @@
|
|
&emac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&rgmii_pins>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
phy-supply = <®_dcdc1>;
|
|
allwinner,tx-delay-ps = <600>;
|
|
diff --git a/arch/arm/dts/sun50i-a64-orangepi-win.dts b/arch/arm/dts/sun50i-a64-orangepi-win.dts
|
|
index b0c64f7579..5b5d4f31b6 100644
|
|
--- a/arch/arm/dts/sun50i-a64-orangepi-win.dts
|
|
+++ b/arch/arm/dts/sun50i-a64-orangepi-win.dts
|
|
@@ -127,7 +127,7 @@
|
|
&emac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&rgmii_pins>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
status = "okay";
|
|
diff --git a/arch/arm/dts/sun50i-a64-pine64-plus.dts b/arch/arm/dts/sun50i-a64-pine64-plus.dts
|
|
index 24f1aac366..b09b4276f1 100644
|
|
--- a/arch/arm/dts/sun50i-a64-pine64-plus.dts
|
|
+++ b/arch/arm/dts/sun50i-a64-pine64-plus.dts
|
|
@@ -52,7 +52,7 @@
|
|
&emac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&rgmii_pins>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-txid";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
|
|
index 53fcc9098d..4a50a18128 100644
|
|
--- a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
|
|
+++ b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
|
|
@@ -95,7 +95,7 @@
|
|
&emac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&rgmii_pins>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
phy-supply = <®_dc1sw>;
|
|
status = "okay";
|
|
diff --git a/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts b/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts
|
|
index df1b9263ad..6e30a564c8 100644
|
|
--- a/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts
|
|
+++ b/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts
|
|
@@ -36,7 +36,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
/delete-property/ allwinner,leds-active-low;
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
|
|
index 4f9ba53ffa..9d93fe1536 100644
|
|
--- a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
|
|
+++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
|
|
@@ -96,7 +96,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
};
|
|
|
|
diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo2.dts
|
|
index b059e20813..e8ab8c2df5 100644
|
|
--- a/arch/arm/dts/sun50i-h5-nanopi-neo2.dts
|
|
+++ b/arch/arm/dts/sun50i-h5-nanopi-neo2.dts
|
|
@@ -75,7 +75,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
};
|
|
|
|
diff --git a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts
|
|
index 70b5f09984..6cc567ea99 100644
|
|
--- a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts
|
|
+++ b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts
|
|
@@ -118,7 +118,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
};
|
|
|
|
diff --git a/arch/arm/dts/sun50i-h5-orangepi-prime.dts b/arch/arm/dts/sun50i-h5-orangepi-prime.dts
|
|
index cb44bfa598..33ab44072e 100644
|
|
--- a/arch/arm/dts/sun50i-h5-orangepi-prime.dts
|
|
+++ b/arch/arm/dts/sun50i-h5-orangepi-prime.dts
|
|
@@ -124,7 +124,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
};
|
|
|
|
diff --git a/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts b/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts
|
|
index ef5ca64442..de448ca51e 100644
|
|
--- a/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts
|
|
+++ b/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts
|
|
@@ -69,7 +69,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
};
|
|
|
|
diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
|
|
index 0dc33c90dd..024035d36e 100644
|
|
--- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts
|
|
+++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
|
|
@@ -64,7 +64,7 @@
|
|
&emac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&ext_rgmii_pins>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
phy-supply = <®_aldo2>;
|
|
status = "okay";
|
|
diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts
|
|
index 1898345183..13fbf26817 100644
|
|
--- a/arch/arm/dts/sun50i-h6-pine-h64.dts
|
|
+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts
|
|
@@ -66,7 +66,7 @@
|
|
&emac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&ext_rgmii_pins>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
phy-supply = <®_aldo2>;
|
|
allwinner,rx-delay-ps = <200>;
|
|
diff --git a/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts
|
|
index e2bfe00588..4dbcad1343 100644
|
|
--- a/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts
|
|
@@ -130,7 +130,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-supply = <®_gmac_3v3>;
|
|
status = "okay";
|
|
|
|
diff --git a/arch/arm/dts/sun7i-a20-bananapi.dts b/arch/arm/dts/sun7i-a20-bananapi.dts
|
|
index 81bc85d398..33040c43bc 100644
|
|
--- a/arch/arm/dts/sun7i-a20-bananapi.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-bananapi.dts
|
|
@@ -132,7 +132,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-supply = <®_gmac_3v3>;
|
|
status = "okay";
|
|
|
|
diff --git a/arch/arm/dts/sun7i-a20-bananapro.dts b/arch/arm/dts/sun7i-a20-bananapro.dts
|
|
index 0176e9de01..8a75545e22 100644
|
|
--- a/arch/arm/dts/sun7i-a20-bananapro.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-bananapro.dts
|
|
@@ -110,7 +110,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-supply = <®_gmac_3v3>;
|
|
status = "okay";
|
|
|
|
diff --git a/arch/arm/dts/sun7i-a20-cubietruck.dts b/arch/arm/dts/sun7i-a20-cubietruck.dts
|
|
index 99f531b8d2..46a9f4669e 100644
|
|
--- a/arch/arm/dts/sun7i-a20-cubietruck.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-cubietruck.dts
|
|
@@ -151,7 +151,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
|
|
phy1: ethernet-phy@1 {
|
|
diff --git a/arch/arm/dts/sun7i-a20-hummingbird.dts b/arch/arm/dts/sun7i-a20-hummingbird.dts
|
|
index fd0153f656..5c3d107094 100644
|
|
--- a/arch/arm/dts/sun7i-a20-hummingbird.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-hummingbird.dts
|
|
@@ -101,7 +101,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-supply = <®_gmac_vdd>;
|
|
/* phy reset config */
|
|
snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */
|
|
diff --git a/arch/arm/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
|
|
index f91e1bee44..8173d77c12 100644
|
|
--- a/arch/arm/dts/sun7i-a20-lamobo-r1.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
|
|
@@ -120,7 +120,7 @@
|
|
&gmac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-supply = <®_gmac_3v3>;
|
|
status = "okay";
|
|
/delete-property/#address-cells;
|
|
diff --git a/arch/arm/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
|
|
index f0e6a96e57..f0c5160ff8 100644
|
|
--- a/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
|
|
@@ -112,7 +112,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
|
|
phy1: ethernet-phy@1 {
|
|
diff --git a/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts b/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts
|
|
index 823aabce04..ff42708137 100644
|
|
--- a/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts
|
|
@@ -106,7 +106,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy3>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-supply = <®_vcc3v3>;
|
|
|
|
snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>;
|
|
diff --git a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
|
|
index 4e1c590eb0..996201665b 100644
|
|
--- a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
|
|
@@ -112,7 +112,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
|
|
phy1: ethernet-phy@1 {
|
|
diff --git a/arch/arm/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/dts/sun7i-a20-orangepi-mini.dts
|
|
index 15881081ca..b80215c61c 100644
|
|
--- a/arch/arm/dts/sun7i-a20-orangepi-mini.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-orangepi-mini.dts
|
|
@@ -121,7 +121,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-supply = <®_gmac_3v3>;
|
|
status = "okay";
|
|
|
|
diff --git a/arch/arm/dts/sun7i-a20-orangepi.dts b/arch/arm/dts/sun7i-a20-orangepi.dts
|
|
index d64de2e73a..66efb7d1ab 100644
|
|
--- a/arch/arm/dts/sun7i-a20-orangepi.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-orangepi.dts
|
|
@@ -97,7 +97,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-supply = <®_gmac_3v3>;
|
|
status = "okay";
|
|
|
|
diff --git a/arch/arm/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
|
|
index 538ea15fa3..205eaae44a 100644
|
|
--- a/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
|
|
@@ -115,7 +115,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
|
|
phy1: ethernet-phy@1 {
|
|
diff --git a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
|
|
index c27e56091f..56cc5791c4 100644
|
|
--- a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
|
|
+++ b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
|
|
@@ -82,7 +82,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
|
|
phy1: ethernet-phy@1 {
|
|
diff --git a/arch/arm/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/dts/sun8i-a83t-bananapi-m3.dts
|
|
index eaff6fa401..2beafe3a31 100644
|
|
--- a/arch/arm/dts/sun8i-a83t-bananapi-m3.dts
|
|
+++ b/arch/arm/dts/sun8i-a83t-bananapi-m3.dts
|
|
@@ -123,7 +123,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_sw>;
|
|
phy-handle = <&rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
allwinner,rx-delay-ps = <700>;
|
|
allwinner,tx-delay-ps = <700>;
|
|
status = "okay";
|
|
diff --git a/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
|
|
index 5dba4fc310..ecd9ff38a8 100644
|
|
--- a/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
|
|
+++ b/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
|
|
@@ -160,7 +160,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_dldo4>;
|
|
phy-handle = <&rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
};
|
|
|
|
diff --git a/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts
|
|
index 4ba533b034..bc370d4ea1 100644
|
|
--- a/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts
|
|
+++ b/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts
|
|
@@ -96,7 +96,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/dts/sun8i-h3-orangepi-plus.dts
|
|
index 97f497854e..d05fa679dc 100644
|
|
--- a/arch/arm/dts/sun8i-h3-orangepi-plus.dts
|
|
+++ b/arch/arm/dts/sun8i-h3-orangepi-plus.dts
|
|
@@ -85,7 +85,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts b/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
|
|
index 6dbf7b2e0c..b6ca45d18e 100644
|
|
--- a/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
|
|
+++ b/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
|
|
@@ -67,7 +67,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
status = "okay";
|
|
};
|
|
|
|
diff --git a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
|
|
index c488aaacbd..9c20245eef 100644
|
|
--- a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
|
|
+++ b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
|
|
@@ -129,7 +129,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy-handle = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-supply = <®_dc1sw>;
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
|
|
index 15c22b06fc..3ab6f47cea 100644
|
|
--- a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
|
|
+++ b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
|
|
@@ -120,7 +120,7 @@
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
phy-handle = <&phy1>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
phy-supply = <®_dc1sw>;
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi b/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
|
|
index 39263e74fb..8e5cb3b3fd 100644
|
|
--- a/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
|
|
+++ b/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
|
|
@@ -126,7 +126,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
|
|
status = "okay";
|
|
};
|
|
--
|
|
2.28.0
|
|
|