Skip to content

Commit 186062c

Browse files
EvilOlafEvilOlaf
committed
rockchip64-7.1: rewrite patches against 7.1-rc7
1 parent 54015e3 commit 186062c

2 files changed

Lines changed: 47 additions & 68 deletions

File tree

‎patch/kernel/archive/rockchip64-7.1/regulator-add-fan53200-driver.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
2424
index 111111111111..222222222222 100644
2525
--- a/arch/arm64/configs/defconfig
2626
+++ b/arch/arm64/configs/defconfig
27-
@@ -866,6 +866,7 @@ CONFIG_REGULATOR_BD9571MWV=y
27+
@@ -867,6 +867,7 @@ CONFIG_REGULATOR_BD9571MWV=y
2828
CONFIG_REGULATOR_CROS_EC=y
2929
CONFIG_REGULATOR_DA9211=m
3030
CONFIG_REGULATOR_FAN53555=y

‎patch/kernel/archive/rockchip64-7.1/rk3588-1220-arm64-dts-rockchip-describe-pcie-ethernets-on-many-boards.patch‎

Lines changed: 46 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 66e234b8a759e479507e9298655af27254f3daf0 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Ricardo Pardini <ricardo@pardini.net>
33
Date: Mon, 1 Jun 2026 21:57:04 +0200
4-
Subject: [PATCH 1/7] dt-bindings: net: add Realtek r8169 family PCIe Ethernet
4+
Subject: dt-bindings: net: add Realtek r8169 family PCIe Ethernet
55

66
Add a binding for fixed/soldered Realtek PCIe Ethernet controllers
77
driven by the r8169 driver (RTL8125/8126/8127/8168 and variants).
@@ -16,14 +16,12 @@ these PCI function nodes can be validated.
1616
Suggested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1717
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
1818
---
19-
.../bindings/net/realtek,r8169.yaml | 54 +++++++++++++++++++
20-
MAINTAINERS | 1 +
21-
2 files changed, 55 insertions(+)
22-
create mode 100644 Documentation/devicetree/bindings/net/realtek,r8169.yaml
19+
Documentation/devicetree/bindings/net/realtek,r8169.yaml | 54 ++++++++++
20+
1 file changed, 54 insertions(+)
2321

2422
diff --git a/Documentation/devicetree/bindings/net/realtek,r8169.yaml b/Documentation/devicetree/bindings/net/realtek,r8169.yaml
2523
new file mode 100644
26-
index 0000000000000..6923211ff4c93
24+
index 000000000000..111111111111
2725
--- /dev/null
2826
+++ b/Documentation/devicetree/bindings/net/realtek,r8169.yaml
2927
@@ -0,0 +1,54 @@
@@ -81,27 +79,13 @@ index 0000000000000..6923211ff4c93
8179
+ local-mac-address = [00 00 00 00 00 00];
8280
+ };
8381
+ };
84-
diff --git a/MAINTAINERS b/MAINTAINERS
85-
index b539be153f6a4..6341de4fadb6c 100644
86-
--- a/MAINTAINERS
87-
+++ b/MAINTAINERS
88-
@@ -134,6 +134,7 @@ M: Heiner Kallweit <hkallweit1@gmail.com>
89-
M: nic_swsd@realtek.com
90-
L: netdev@vger.kernel.org
91-
S: Maintained
92-
+F: Documentation/devicetree/bindings/net/realtek,r8169.yaml
93-
F: drivers/net/ethernet/realtek/r8169*
94-
95-
8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
9682
--
97-
2.54.0
98-
83+
Armbian
9984

100-
From 8494a3f81766c93a11c0d6c59232f375d8f5e7cb Mon Sep 17 00:00:00 2001
85+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
10186
From: Ricardo Pardini <ricardo@pardini.net>
10287
Date: Mon, 12 Jan 2026 19:25:15 +0100
103-
Subject: [PATCH 2/7] arm64: dts: rockchip: describe PCIe RTL8125 Ethernets on
104-
NanoPC-T6
88+
Subject: arm64: dts: rockchip: describe PCIe RTL8125 Ethernets on NanoPC-T6
10589

10690
The FriendlyElec NanoPC-T6 carries two on-board Realtek RTL8125 NICs
10791
behind pcie2x1l0 and pcie2x1l2.
@@ -114,11 +98,11 @@ stable MAC across boots that both U-Boot and the kernel agree on.
11498

11599
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
116100
---
117-
.../boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 30 +++++++++++++++++++
101+
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 30 ++++++++++
118102
1 file changed, 30 insertions(+)
119103

120104
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
121-
index 84b6b53f016ab..04c4479f08170 100644
105+
index 111111111111..222222222222 100644
122106
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
123107
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
124108
@@ -20,6 +20,8 @@ / {
@@ -130,7 +114,7 @@ index 84b6b53f016ab..04c4479f08170 100644
130114
mmc0 = &sdhci;
131115
mmc1 = &sdmmc;
132116
};
133-
@@ -635,6 +637,20 @@ &pcie2x1l0 {
117+
@@ -671,6 +673,20 @@ &pcie2x1l0 {
134118
pinctrl-names = "default";
135119
pinctrl-0 = <&pcie2_0_rst>;
136120
status = "okay";
@@ -151,7 +135,7 @@ index 84b6b53f016ab..04c4479f08170 100644
151135
};
152136

153137
&pcie2x1l1 {
154-
@@ -651,6 +667,20 @@ &pcie2x1l2 {
138+
@@ -687,6 +703,20 @@ &pcie2x1l2 {
155139
pinctrl-names = "default";
156140
pinctrl-0 = <&pcie2_2_rst>;
157141
status = "okay";
@@ -173,14 +157,13 @@ index 84b6b53f016ab..04c4479f08170 100644
173157

174158
&pcie30phy {
175159
--
176-
2.54.0
160+
Armbian
177161

178-
179-
From 221d265bba63db6da6e03c5560cb47f200b726df Mon Sep 17 00:00:00 2001
162+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
180163
From: Ricardo Pardini <ricardo@pardini.net>
181164
Date: Mon, 1 Jun 2026 22:20:02 +0200
182-
Subject: [PATCH 3/7] arm64: dts: rockchip: describe PCIe RTL8125 Ethernet on
183-
FriendlyElec CM3588-NAS
165+
Subject: arm64: dts: rockchip: describe PCIe RTL8125 Ethernet on FriendlyElec
166+
CM3588-NAS
184167

185168
The FriendlyElec CM3588-NAS carrier carries an on-board Realtek
186169
RTL8125 NIC behind pcie2x1l2.
@@ -193,11 +176,11 @@ both U-Boot and the kernel agree on.
193176

194177
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
195178
---
196-
.../rk3588-friendlyelec-cm3588-nas.dts | 21 +++++++++++++++++++
179+
arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts | 21 ++++++++++
197180
1 file changed, 21 insertions(+)
198181

199182
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
200-
index 10a7d3691a26f..ba21ffbaaedf7 100644
183+
index 111111111111..222222222222 100644
201184
--- a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
202185
+++ b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
203186
@@ -19,6 +19,10 @@ / {
@@ -211,7 +194,7 @@ index 10a7d3691a26f..ba21ffbaaedf7 100644
211194
adc_key_recovery: adc-key-recovery {
212195
compatible = "adc-keys";
213196
io-channels = <&saradc 1>;
214-
@@ -473,6 +477,23 @@ &pcie2x1l1 {
197+
@@ -512,6 +516,23 @@ &pcie2x1l1 {
215198
status = "okay";
216199
};
217200

@@ -236,14 +219,13 @@ index 10a7d3691a26f..ba21ffbaaedf7 100644
236219
/*
237220
* Data lane mapping <1 3 2 4> = x1x1 x1x1 (bifurcation of both ports)
238221
--
239-
2.54.0
240-
222+
Armbian
241223

242-
From be0886fba8e0013cfd5edf4d06c214ebb0e442c5 Mon Sep 17 00:00:00 2001
224+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
243225
From: Ricardo Pardini <ricardo@pardini.net>
244226
Date: Mon, 1 Jun 2026 22:42:11 +0200
245-
Subject: [PATCH 4/7] arm64: dts: rockchip: describe PCIe RTL8125 Ethernet on
246-
FriendlyElec NanoPi R5S
227+
Subject: arm64: dts: rockchip: describe PCIe RTL8125 Ethernet on FriendlyElec
228+
NanoPi R5S
247229

248230
The FriendlyElec NanoPi R5S (rk3568) carries two on-board Realtek
249231
RTL8125 NICs behind pcie2x1 and pcie3x1, alongside the existing gmac0
@@ -257,11 +239,11 @@ and the kernel agree on.
257239

258240
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
259241
---
260-
.../boot/dts/rockchip/rk3568-nanopi-r5s.dts | 30 +++++++++++++++++++
242+
arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 30 ++++++++++
261243
1 file changed, 30 insertions(+)
262244

263245
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
264-
index 718d1a2da8e56..488b5fb40522b 100644
246+
index 111111111111..222222222222 100644
265247
--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
266248
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
267249
@@ -15,6 +15,8 @@ / {
@@ -316,14 +298,13 @@ index 718d1a2da8e56..488b5fb40522b 100644
316298

317299
&pcie3x2 {
318300
--
319-
2.54.0
301+
Armbian
320302

321-
322-
From 318a4577ff828ed37384b9b5e3f7527800ddfcd9 Mon Sep 17 00:00:00 2001
303+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
323304
From: Ricardo Pardini <ricardo@pardini.net>
324305
Date: Mon, 1 Jun 2026 22:51:51 +0200
325-
Subject: [PATCH 5/7] arm64: dts: rockchip: describe PCIe RTL8125 Ethernet on
326-
FriendlyElec NanoPi R6C
306+
Subject: arm64: dts: rockchip: describe PCIe RTL8125 Ethernet on FriendlyElec
307+
NanoPi R6C
327308

328309
The FriendlyElec NanoPi R6C carries one on-board Realtek RTL8125 NIC
329310
(the LAN port; WAN uses the on-SoC gmac1 RGMII PHY) behind pcie2x1l1.
@@ -339,11 +320,11 @@ RTL8125-capable lane is empty compared to the R6S.
339320

340321
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
341322
---
342-
.../boot/dts/rockchip/rk3588s-nanopi-r6c.dts | 21 +++++++++++++++++++
323+
arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts | 21 ++++++++++
343324
1 file changed, 21 insertions(+)
344325

345326
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
346-
index ccc5e46275176..b142df0b0e180 100644
327+
index 111111111111..222222222222 100644
347328
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
348329
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
349330
@@ -7,8 +7,29 @@
@@ -377,14 +358,13 @@ index ccc5e46275176..b142df0b0e180 100644
377358
+ };
378359
+};
379360
--
380-
2.54.0
381-
361+
Armbian
382362

383-
From fd0afdbbf82440d49611467535c76bc3af0324b6 Mon Sep 17 00:00:00 2001
363+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
384364
From: Ricardo Pardini <ricardo@pardini.net>
385365
Date: Mon, 1 Jun 2026 22:12:31 +0200
386-
Subject: [PATCH 6/7] arm64: dts: rockchip: describe PCIe RTL8125 Ethernet on
387-
Radxa ROCK 5 family
366+
Subject: arm64: dts: rockchip: describe PCIe RTL8125 Ethernet on Radxa ROCK 5
367+
family
388368

389369
The Radxa ROCK 5B / 5B+ / 5T all carry on-board Realtek RTL8125 NICs.
390370

@@ -398,12 +378,12 @@ additionally describes pcie2x1l1 with its second RTL8125.
398378

399379
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
400380
---
401-
.../dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 15 +++++++++++++++
402-
.../arm64/boot/dts/rockchip/rk3588-rock-5t.dts | 18 ++++++++++++++++++
381+
arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 15 ++++++++
382+
arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts | 18 ++++++++++
403383
2 files changed, 33 insertions(+)
404384

405385
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
406-
index bf4a1d2e55ca3..1b48f57638fca 100644
386+
index 111111111111..222222222222 100644
407387
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
408388
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
409389
@@ -10,6 +10,7 @@
@@ -436,7 +416,7 @@ index bf4a1d2e55ca3..1b48f57638fca 100644
436416

437417
&pcie30phy {
438418
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
439-
index 425036146b6d9..116e3512c4413 100644
419+
index 111111111111..222222222222 100644
440420
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
441421
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
442422
@@ -8,6 +8,10 @@ / {
@@ -472,14 +452,13 @@ index 425036146b6d9..116e3512c4413 100644
472452

473453
&pcie30phy {
474454
--
475-
2.54.0
476-
455+
Armbian
477456

478-
From ba497ede96297b428a2723fb93a1dc10c8c98eb6 Mon Sep 17 00:00:00 2001
457+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
479458
From: Ricardo Pardini <ricardo@pardini.net>
480459
Date: Wed, 3 Jun 2026 20:51:55 +0200
481-
Subject: [PATCH 7/7] arm64: dts: rockchip: describe PCIe RTL8125 Ethernet on
482-
Radxa ROCK 5 ITX
460+
Subject: arm64: dts: rockchip: describe PCIe RTL8125 Ethernet on Radxa ROCK 5
461+
ITX
483462

484463
The Radxa ROCK 5 ITX carries two on-board Realtek RTL8125 NICs behind
485464
pcie2x1l1 and pcie2x1l2.
@@ -491,11 +470,11 @@ boots that both U-Boot and the kernel agree on.
491470

492471
Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
493472
---
494-
.../boot/dts/rockchip/rk3588-rock-5-itx.dts | 30 +++++++++++++++++++
473+
arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 30 ++++++++++
495474
1 file changed, 30 insertions(+)
496475

497476
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
498-
index f7dd01d6fa0ab..8c6c29667ea02 100644
477+
index 111111111111..222222222222 100644
499478
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
500479
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
501480
@@ -20,6 +20,8 @@ / {
@@ -550,5 +529,5 @@ index f7dd01d6fa0ab..8c6c29667ea02 100644
550529

551530
&pcie30phy {
552531
--
553-
2.54.0
532+
Armbian
554533

0 commit comments

Comments
 (0)