Skip to content

Commit 7bb5101

Browse files
lanefu5kft
andauthored
AR-512 OPI3 ethernet related stuff (#2473)
* remove tx-rx delay patch * remove rx-tx patch for sunxi-dev * updated additional phy-mode configurations * cleaned up erroneous patch * fixed phy-mode for orangepi-zero-plus H5 * fixed phy-mode for zeropi and opi zero2 Co-authored-by: 5kft <5kft@users.noreply.github.com>
2 parents 59243dc + 864170f commit 7bb5101

9 files changed

+53
-156
lines changed

patch/kernel/sunxi-current/revert-rtl8211e-rx-tx-delay-config-change.patch

Lines changed: 0 additions & 74 deletions
This file was deleted.

patch/kernel/sunxi-dev/board-h3-add-nanopi-r1-and-duo2.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ index 000000000..731c705a4
152152
+ pinctrl-0 = <&emac_rgmii_pins>;
153153
+ phy-supply = <&reg_gmac_3v3>;
154154
+ phy-handle = <&ext_rgmii_phy>;
155-
+ phy-mode = "rgmii";
155+
+ phy-mode = "rgmii-id";
156156
+
157157
+ status = "okay";
158158
+};
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/arch/arm/boot/dts/sun8i-h3-zeropi.dts b/arch/arm/boot/dts/sun8i-h3-zeropi.dts
2+
index c8be3a7a1..9b14e930a 100644
3+
--- a/arch/arm/boot/dts/sun8i-h3-zeropi.dts
4+
+++ b/arch/arm/boot/dts/sun8i-h3-zeropi.dts
5+
@@ -88,7 +88,7 @@ &emac {
6+
pinctrl-0 = <&emac_rgmii_pins>;
7+
phy-supply = <&reg_gmac_3v3>;
8+
phy-handle = <&ext_rgmii_phy>;
9+
- phy-mode = "rgmii";
10+
+ phy-mode = "rgmii-id";
11+
12+
allwinner,leds-active-low;
13+
status = "okay";

patch/kernel/sunxi-dev/board-h5-add-0001-nanopi-neo-core2.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ index 000000000..b3035ddd7
146146
+ pinctrl-0 = <&emac_rgmii_pins>;
147147
+ phy-supply = <&reg_gmac_3v3>;
148148
+ phy-handle = <&ext_rgmii_phy>;
149-
+ phy-mode = "rgmii";
149+
+ phy-mode = "rgmii-id";
150150
+ status = "okay";
151151
+};
152152
+

patch/kernel/sunxi-dev/board-h5-add-0002-nanopi-neo2-v1.1.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ index 00000000..cab3c73b
153153
+ pinctrl-0 = <&emac_rgmii_pins>;
154154
+ phy-supply = <&reg_gmac_3v3>;
155155
+ phy-handle = <&ext_rgmii_phy>;
156-
+ phy-mode = "rgmii";
156+
+ phy-mode = "rgmii-id";
157157
+ status = "okay";
158158
+};
159159
+

patch/kernel/sunxi-dev/board-h5-nanopi-neo2-v1.0-add-regulator.patch renamed to patch/kernel/sunxi-dev/board-h5-nanopi-neo2-v1.0-add-regulator-fix-phymode.patch

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
2-
index cc268a697..c839b4c0b 100644
2+
index ea417eb01..fcf5a1a04 100644
33
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
44
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
5-
@@ -64,12 +64,13 @@
5+
@@ -26,12 +26,13 @@ leds {
66
pwr {
77
label = "nanopi:green:pwr";
88
gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
@@ -17,7 +17,7 @@ index cc268a697..c839b4c0b 100644
1717
};
1818
};
1919

20-
@@ -90,6 +91,21 @@
20+
@@ -52,6 +53,22 @@ reg_vcc3v3: vcc3v3 {
2121
regulator-max-microvolt = <3300000>;
2222
};
2323

@@ -36,10 +36,11 @@ index cc268a697..c839b4c0b 100644
3636
+ states = <1100000 0x0
3737
+ 1100000 0x1>;
3838
+ };
39+
+
3940
reg_usb0_vbus: usb0-vbus {
4041
compatible = "regulator-fixed";
4142
regulator-name = "usb0-vbus";
42-
@@ -101,6 +117,10 @@
43+
@@ -63,6 +80,10 @@ reg_usb0_vbus: usb0-vbus {
4344
};
4445
};
4546

@@ -50,3 +51,12 @@ index cc268a697..c839b4c0b 100644
5051
&ehci0 {
5152
status = "okay";
5253
};
54+
@@ -76,7 +97,7 @@ &emac {
55+
pinctrl-0 = <&emac_rgmii_pins>;
56+
phy-supply = <&reg_gmac_3v3>;
57+
phy-handle = <&ext_rgmii_phy>;
58+
- phy-mode = "rgmii";
59+
+ phy-mode = "rgmii-id";
60+
status = "okay";
61+
};
62+

patch/kernel/sunxi-dev/board-h5-orangepi-zero-plus-fixes.patch

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
2-
index ef5ca6444..17ca885b4 100644
2+
index ef5ca6444..a3359924f 100644
33
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
44
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
55
@@ -4,6 +4,7 @@
@@ -53,3 +53,12 @@ index ef5ca6444..17ca885b4 100644
5353
};
5454

5555
&ehci0 {
56+
@@ -69,7 +92,7 @@ &emac {
57+
pinctrl-0 = <&emac_rgmii_pins>;
58+
phy-supply = <&reg_gmac_3v3>;
59+
phy-handle = <&ext_rgmii_phy>;
60+
- phy-mode = "rgmii";
61+
+ phy-mode = "rgmii-id";
62+
status = "okay";
63+
};
64+
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
2+
index 814f5b4fe..3feeb7e28 100644
3+
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
4+
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
5+
@@ -71,7 +71,7 @@ &ehci1 {
6+
&emac0 {
7+
pinctrl-names = "default";
8+
pinctrl-0 = <&ext_rgmii_pins>;
9+
- phy-mode = "rgmii";
10+
+ phy-mode = "rgmii-id";
11+
phy-handle = <&ext_rgmii_phy>;
12+
phy-supply = <&reg_dcdce>;
13+
allwinner,rx-delay-ps = <3100>;

patch/kernel/sunxi-dev/revert-rtl8211e-rx-tx-delay-config-change.patch

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)