Skip to content

Commit 6faa364

Browse files
committed
nanopi-r5c: apply static MAC addresses for both Ethernet adapters
U-Boot generates and assigns two MAC addresses for Rockchip SBCs with ethernet0 and ethernet1 aliases pointing to repsective device nodes. The PCIe child nodes for both 2.5 Gbit Ethernet adapters with the needed "local-mac-address" properties are added with this patch, as well as the respective aliases. Signed-off-by: MichaIng <micha@dietpi.com>
1 parent 166b786 commit 6faa364

File tree

2 files changed

+100
-0
lines changed

2 files changed

+100
-0
lines changed
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts
2+
index c718b8dbb9c6b..58d893b87d121 100644
3+
--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts
4+
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts
5+
@@ -13,6 +13,11 @@ / {
6+
model = "FriendlyElec NanoPi R5C";
7+
compatible = "friendlyarm,nanopi-r5c", "rockchip,rk3568";
8+
9+
+ aliases {
10+
+ ethernet0 = &r8125_1;
11+
+ ethernet1 = &r8125_2;
12+
+ };
13+
+
14+
gpio-keys {
15+
compatible = "gpio-keys";
16+
pinctrl-names = "default";
17+
@@ -70,6 +75,16 @@ &pcie3x1 {
18+
reset-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
19+
vpcie3v3-supply = <&vcc3v3_pcie>;
20+
status = "okay";
21+
+
22+
+ pcie@0,0 {
23+
+ reg = <0 0 0 0 0>;
24+
+ #address-cells = <3>;
25+
+ #size-cells = <2>;
26+
+ r8125_1: pcie@1,0 {
27+
+ reg = <0 0 0 0 0>;
28+
+ local-mac-address = [ 00 00 00 00 00 00 ];
29+
+ };
30+
+ };
31+
};
32+
33+
&pcie3x2 {
34+
@@ -77,6 +92,16 @@ &pcie3x2 {
35+
reset-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
36+
vpcie3v3-supply = <&vcc3v3_pcie>;
37+
status = "okay";
38+
+
39+
+ pcie@0,0 {
40+
+ reg = <0 0 0 0 0>;
41+
+ #address-cells = <3>;
42+
+ #size-cells = <2>;
43+
+ r8125_2: pcie@1,0 {
44+
+ reg = <0 0 0 0 0>;
45+
+ local-mac-address = [ 00 00 00 00 00 00 ];
46+
+ };
47+
+ };
48+
};
49+
50+
&pinctrl {
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts
2+
index c718b8dbb9c6b..58d893b87d121 100644
3+
--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts
4+
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts
5+
@@ -13,6 +13,11 @@ / {
6+
model = "FriendlyElec NanoPi R5C";
7+
compatible = "friendlyarm,nanopi-r5c", "rockchip,rk3568";
8+
9+
+ aliases {
10+
+ ethernet0 = &r8125_1;
11+
+ ethernet1 = &r8125_2;
12+
+ };
13+
+
14+
gpio-keys {
15+
compatible = "gpio-keys";
16+
pinctrl-names = "default";
17+
@@ -70,6 +75,16 @@ &pcie3x1 {
18+
reset-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
19+
vpcie3v3-supply = <&vcc3v3_pcie>;
20+
status = "okay";
21+
+
22+
+ pcie@0,0 {
23+
+ reg = <0 0 0 0 0>;
24+
+ #address-cells = <3>;
25+
+ #size-cells = <2>;
26+
+ r8125_1: pcie@1,0 {
27+
+ reg = <0 0 0 0 0>;
28+
+ local-mac-address = [ 00 00 00 00 00 00 ];
29+
+ };
30+
+ };
31+
};
32+
33+
&pcie3x2 {
34+
@@ -77,6 +92,16 @@ &pcie3x2 {
35+
reset-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
36+
vpcie3v3-supply = <&vcc3v3_pcie>;
37+
status = "okay";
38+
+
39+
+ pcie@0,0 {
40+
+ reg = <0 0 0 0 0>;
41+
+ #address-cells = <3>;
42+
+ #size-cells = <2>;
43+
+ r8125_2: pcie@1,0 {
44+
+ reg = <0 0 0 0 0>;
45+
+ local-mac-address = [ 00 00 00 00 00 00 ];
46+
+ };
47+
+ };
48+
};
49+
50+
&pinctrl {

0 commit comments

Comments
 (0)