Skip to content

Commit 617cfd4

Browse files
aiamadeusdesmondc9
aiamadeus
authored and
desmondc9
committed
rockchip: replace patches with upstream
1 parent 745d8f9 commit 617cfd4

7 files changed

+56
-59
lines changed

‎target/linux/rockchip/files-5.10/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts

-19
This file was deleted.

‎target/linux/rockchip/files-5.15/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts

-19
This file was deleted.

‎target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch

+16
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,19 @@
88
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
99
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
1010
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb
11+
--- /dev/null
12+
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
13+
@@ -0,0 +1,13 @@
14+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
15+
+/*
16+
+ * Copyright (c) 2019 Akash Gajjar <[email protected]>
17+
+ * Copyright (c) 2019 Pragnesh Patel <[email protected]>
18+
+ */
19+
+
20+
+/dts-v1/;
21+
+#include "rk3399-rock-pi-4.dtsi"
22+
+
23+
+/ {
24+
+ model = "Radxa ROCK Pi 4";
25+
+ compatible = "radxa,rockpi4", "rockchip,rk3399";
26+
+};

‎target/linux/rockchip/patches-5.15/108-drivers-phy-rockchip-Support-PCIe-v3.patch ‎target/linux/rockchip/patches-5.15/070-v6.1-phy-rockchip-Support-PCIe-v3.patch

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
From cfb1aa4c805e58287dd0ce292b5c64309e3dba2f Mon Sep 17 00:00:00 2001
2-
From: Frank Wunderlich <[email protected]>
1+
From 2e9bffc4f713db465177238f6033f7d367d6f151 Mon Sep 17 00:00:00 2001
2+
From: Shawn Lin <[email protected]>
33
Date: Thu, 25 Aug 2022 21:38:34 +0200
44
Subject: [PATCH] phy: rockchip: Support PCIe v3
55

@@ -17,6 +17,8 @@ means controller x is assigned to phy lane.
1717
Signed-off-by: Shawn Lin <[email protected]>
1818
Suggested-by: Peter Geis <[email protected]>
1919
Signed-off-by: Frank Wunderlich <[email protected]>
20+
Link: https://lore.kernel.org/r/[email protected]
21+
Signed-off-by: Vinod Koul <[email protected]>
2022
---
2123
drivers/phy/rockchip/Kconfig | 9 +
2224
drivers/phy/rockchip/Makefile | 1 +
@@ -46,7 +48,7 @@ Signed-off-by: Frank Wunderlich <[email protected]>
4648
depends on OF && (ARCH_ROCKCHIP || COMPILE_TEST)
4749
--- a/drivers/phy/rockchip/Makefile
4850
+++ b/drivers/phy/rockchip/Makefile
49-
@@ -8,5 +8,6 @@ obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) +=
51+
@@ -8,5 +8,6 @@ obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) += phy-rockchip-inno-hdmi.o
5052
obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o
5153
obj-$(CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY) += phy-rockchip-naneng-combphy.o
5254
obj-$(CONFIG_PHY_ROCKCHIP_PCIE) += phy-rockchip-pcie.o

‎target/linux/rockchip/patches-5.15/109-arm64-dts-rockchip-rk3568-Add-PCIe-v3-nodes.patch ‎target/linux/rockchip/patches-5.15/071-v6.1-arm64-dts-rockchip-Add-PCIe-v3-nodes-to-rk3568.patch

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
From 4b3da1efaa295802ffad3c2bf310ef73af416f12 Mon Sep 17 00:00:00 2001
2-
From: Frank Wunderlich <[email protected]>
3-
Date: Thu, 25 Aug 2022 21:38:35 +0200
4-
Subject: [PATCH] arm64: dts: rockchip: rk3568: Add PCIe v3 nodes
5-
6-
Add nodes to rk356x devicetree to support PCIe v3.
7-
8-
Signed-off-by: Peter Geis <[email protected]>
9-
Signed-off-by: Frank Wunderlich <[email protected]>
10-
---
11-
arch/arm64/boot/dts/rockchip/rk3568.dtsi | 122 +++++++++++++++++++++++
12-
1 file changed, 122 insertions(+)
13-
1+
From faedfa5b40f095d09040c3a040e2f8dee4a36b4b Mon Sep 17 00:00:00 2001
2+
From: Frank Wunderlich <[email protected]>
3+
Date: Thu, 25 Aug 2022 21:38:35 +0200
4+
Subject: [PATCH] arm64: dts: rockchip: Add PCIe v3 nodes to rk3568
5+
6+
Add nodes to rk356x devicetree to support PCIe v3.
7+
8+
Signed-off-by: Peter Geis <[email protected]>
9+
Signed-off-by: Frank Wunderlich <[email protected]>
10+
Link: https://lore.kernel.org/r/[email protected]
11+
Signed-off-by: Heiko Stuebner <[email protected]>
12+
---
13+
arch/arm64/boot/dts/rockchip/rk3568.dtsi | 122 +++++++++++++++++++++++
14+
1 file changed, 122 insertions(+)
15+
1416
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
1517
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
1618
@@ -42,6 +42,128 @@

‎target/linux/rockchip/patches-5.15/105-rockchip-rock-pi-4.patch

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,35 @@
11
--- a/arch/arm64/boot/dts/rockchip/Makefile
22
+++ b/arch/arm64/boot/dts/rockchip/Makefile
3-
@@ -26,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gr
3+
@@ -26,6 +26,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gr
44
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
55
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
66
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb
77
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-guangmiao-g4c.dtb
8+
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4se.dtb
89
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
910
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb
1011
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
11-
@@ -42,6 +43,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pi
12+
@@ -42,6 +44,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pi
1213
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
1314
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
1415
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
1516
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb
1617
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
1718
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
1819
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb
20+
--- /dev/null
21+
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
22+
@@ -0,0 +1,13 @@
23+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
24+
+/*
25+
+ * Copyright (c) 2019 Akash Gajjar <[email protected]>
26+
+ * Copyright (c) 2019 Pragnesh Patel <[email protected]>
27+
+ */
28+
+
29+
+/dts-v1/;
30+
+#include "rk3399-rock-pi-4.dtsi"
31+
+
32+
+/ {
33+
+ model = "Radxa ROCK Pi 4";
34+
+ compatible = "radxa,rockpi4", "rockchip,rk3399";
35+
+};

‎target/linux/rockchip/patches-5.15/900-arm64-boot-add-dts-files.patch.patch ‎target/linux/rockchip/patches-5.15/210-rockchip-rk356x-add-support-for-new-boards.patch

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
--- a/arch/arm64/boot/dts/rockchip/Makefile
22
+++ b/arch/arm64/boot/dts/rockchip/Makefile
3-
@@ -57,4 +57,12 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ro
4-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
3+
@@ -58,3 +58,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
54
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
65
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
7-
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4se.dtb
86
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
97
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-mrkaio-m68s.dtb
108
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb

0 commit comments

Comments
 (0)