mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-13 23:42:04 +08:00
rockchip: replace patches with upstream
This commit is contained in:
parent
e623e8cd60
commit
a7a5b42f8a
@ -1,19 +0,0 @@
|
|||||||
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
||||||
/*
|
|
||||||
* Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
|
|
||||||
* Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* TODO
|
|
||||||
* Delete this file and migrate RockPi 4 to RockPi 4A after
|
|
||||||
* removing Kernel 5.4.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/dts-v1/;
|
|
||||||
#include "rk3399-rock-pi-4.dtsi"
|
|
||||||
|
|
||||||
/ {
|
|
||||||
model = "Radxa ROCK Pi 4";
|
|
||||||
compatible = "radxa,rockpi4", "rockchip,rk3399";
|
|
||||||
};
|
|
@ -1,19 +0,0 @@
|
|||||||
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
||||||
/*
|
|
||||||
* Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
|
|
||||||
* Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* TODO
|
|
||||||
* Delete this file and migrate RockPi 4 to RockPi 4A after
|
|
||||||
* removing Kernel 5.4.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/dts-v1/;
|
|
||||||
#include "rk3399-rock-pi-4.dtsi"
|
|
||||||
|
|
||||||
/ {
|
|
||||||
model = "Radxa ROCK Pi 4";
|
|
||||||
compatible = "radxa,rockpi4", "rockchip,rk3399";
|
|
||||||
};
|
|
@ -8,3 +8,19 @@
|
|||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||||
|
@@ -0,0 +1,13 @@
|
||||||
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||||
|
+/*
|
||||||
|
+ * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
|
||||||
|
+ * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+/dts-v1/;
|
||||||
|
+#include "rk3399-rock-pi-4.dtsi"
|
||||||
|
+
|
||||||
|
+/ {
|
||||||
|
+ model = "Radxa ROCK Pi 4";
|
||||||
|
+ compatible = "radxa,rockpi4", "rockchip,rk3399";
|
||||||
|
+};
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
From cfb1aa4c805e58287dd0ce292b5c64309e3dba2f Mon Sep 17 00:00:00 2001
|
From 2e9bffc4f713db465177238f6033f7d367d6f151 Mon Sep 17 00:00:00 2001
|
||||||
From: Frank Wunderlich <linux@fw-web.de>
|
From: Shawn Lin <shawn.lin@rock-chips.com>
|
||||||
Date: Thu, 25 Aug 2022 21:38:34 +0200
|
Date: Thu, 25 Aug 2022 21:38:34 +0200
|
||||||
Subject: [PATCH] phy: rockchip: Support PCIe v3
|
Subject: [PATCH] phy: rockchip: Support PCIe v3
|
||||||
|
|
||||||
@ -17,6 +17,8 @@ means controller x is assigned to phy lane.
|
|||||||
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
|
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
|
||||||
Suggested-by: Peter Geis <pgwipeout@gmail.com>
|
Suggested-by: Peter Geis <pgwipeout@gmail.com>
|
||||||
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
||||||
|
Link: https://lore.kernel.org/r/20220825193836.54262-4-linux@fw-web.de
|
||||||
|
Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
||||||
---
|
---
|
||||||
drivers/phy/rockchip/Kconfig | 9 +
|
drivers/phy/rockchip/Kconfig | 9 +
|
||||||
drivers/phy/rockchip/Makefile | 1 +
|
drivers/phy/rockchip/Makefile | 1 +
|
||||||
@ -46,7 +48,7 @@ Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
|||||||
depends on OF && (ARCH_ROCKCHIP || COMPILE_TEST)
|
depends on OF && (ARCH_ROCKCHIP || COMPILE_TEST)
|
||||||
--- a/drivers/phy/rockchip/Makefile
|
--- a/drivers/phy/rockchip/Makefile
|
||||||
+++ b/drivers/phy/rockchip/Makefile
|
+++ b/drivers/phy/rockchip/Makefile
|
||||||
@@ -8,5 +8,6 @@ obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) +=
|
@@ -8,5 +8,6 @@ obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) += phy-rockchip-inno-hdmi.o
|
||||||
obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o
|
obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o
|
||||||
obj-$(CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY) += phy-rockchip-naneng-combphy.o
|
obj-$(CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY) += phy-rockchip-naneng-combphy.o
|
||||||
obj-$(CONFIG_PHY_ROCKCHIP_PCIE) += phy-rockchip-pcie.o
|
obj-$(CONFIG_PHY_ROCKCHIP_PCIE) += phy-rockchip-pcie.o
|
@ -1,16 +1,18 @@
|
|||||||
From 4b3da1efaa295802ffad3c2bf310ef73af416f12 Mon Sep 17 00:00:00 2001
|
From faedfa5b40f095d09040c3a040e2f8dee4a36b4b Mon Sep 17 00:00:00 2001
|
||||||
From: Frank Wunderlich <linux@fw-web.de>
|
From: Frank Wunderlich <frank-w@public-files.de>
|
||||||
Date: Thu, 25 Aug 2022 21:38:35 +0200
|
Date: Thu, 25 Aug 2022 21:38:35 +0200
|
||||||
Subject: [PATCH] arm64: dts: rockchip: rk3568: Add PCIe v3 nodes
|
Subject: [PATCH] arm64: dts: rockchip: Add PCIe v3 nodes to rk3568
|
||||||
|
|
||||||
Add nodes to rk356x devicetree to support PCIe v3.
|
Add nodes to rk356x devicetree to support PCIe v3.
|
||||||
|
|
||||||
Signed-off-by: Peter Geis <pgwipeout@gmail.com>
|
Signed-off-by: Peter Geis <pgwipeout@gmail.com>
|
||||||
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
||||||
---
|
Link: https://lore.kernel.org/r/20220825193836.54262-5-linux@fw-web.de
|
||||||
arch/arm64/boot/dts/rockchip/rk3568.dtsi | 122 +++++++++++++++++++++++
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||||
1 file changed, 122 insertions(+)
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3568.dtsi | 122 +++++++++++++++++++++++
|
||||||
|
1 file changed, 122 insertions(+)
|
||||||
|
|
||||||
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
|
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
|
||||||
@@ -42,6 +42,128 @@
|
@@ -42,6 +42,128 @@
|
@ -1,14 +1,15 @@
|
|||||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||||
@@ -26,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gr
|
@@ -26,6 +26,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gr
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb
|
||||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-guangmiao-g4c.dtb
|
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-guangmiao-g4c.dtb
|
||||||
|
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4se.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
|
||||||
@@ -42,6 +43,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pi
|
@@ -42,6 +44,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pi
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
|
||||||
@ -16,3 +17,19 @@
|
|||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||||
|
@@ -0,0 +1,13 @@
|
||||||
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||||
|
+/*
|
||||||
|
+ * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
|
||||||
|
+ * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+/dts-v1/;
|
||||||
|
+#include "rk3399-rock-pi-4.dtsi"
|
||||||
|
+
|
||||||
|
+/ {
|
||||||
|
+ model = "Radxa ROCK Pi 4";
|
||||||
|
+ compatible = "radxa,rockpi4", "rockchip,rk3399";
|
||||||
|
+};
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||||
@@ -57,4 +57,12 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ro
|
@@ -58,3 +58,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
|
||||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4se.dtb
|
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
|
||||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-mrkaio-m68s.dtb
|
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-mrkaio-m68s.dtb
|
||||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb
|
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb
|
Loading…
x
Reference in New Issue
Block a user