enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip-rk3588-edge: update USB3 patches from Collabora tree

Browse Source
This commit is contained in:
Muhammed Efe Cetin 2024-02-27 16:29:28 +03:00 committed by Igor
parent a3152125a4
commit 3b224e48a1
9 changed files with 1170 additions and 1483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2249
patch/kernel/rockchip-rk3588-edge/0021-RK3588-Add-USB3-DRD-Support.patch
View File

File diff suppressed because it is too large Load Diff

36
patch/kernel/rockchip-rk3588-edge/0026-Add-missing-nodes-to-Orange-Pi-5.patch
View File

@ -1,14 +1,14 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 455c18d58092dab508cf7585d9c863a9c4bd5fe1 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Thu, 16 Nov 2023 18:09:07 +0300
Subject: arm64: dts: Add missing nodes to Orange Pi 5
Subject: [PATCH] arm64: dts: Add missing nodes to Orange Pi 5
---
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 228 +++++++++-
1 file changed, 227 insertions(+), 1 deletion(-)
.../boot/dts/rockchip/rk3588s-orangepi-5.dts | 215 +++++++++++++++++-
1 file changed, 214 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
index e3a839a12dc6..ced3371f73c5 100644
index 25de4362af38..f5e86d99084d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
@@ -6,6 +6,8 @@
@ -204,7 +204,7 @@ index e3a839a12dc6..ced3371f73c5 100644
};
&saradc {
@@ -363,7 +493,7 @@ regulator-state-mem {
@@ -364,7 +494,7 @@ regulator-state-mem {
};
};
@ -213,7 +213,7 @@ index e3a839a12dc6..ced3371f73c5 100644
regulator-name = "vdd_cpu_lit_s0";
regulator-always-on;
regulator-boot-on;
@@ -624,6 +754,14 @@ &tsadc {
@@ -625,6 +755,14 @@ &tsadc {
status = "okay";
};
@ -228,7 +228,7 @@ index e3a839a12dc6..ced3371f73c5 100644
&u2phy2 {
status = "okay";
};
@@ -649,10 +787,56 @@ &usb_host0_ehci {
@@ -650,10 +788,48 @@ &usb_host0_ehci {
status = "okay";
};
@ -254,14 +254,6 @@ index e3a839a12dc6..ced3371f73c5 100644
+ };
+ };
+};
+
+&usbdp_phy0_dp {
+ status = "okay";
+};
+
+&usbdp_phy0_u3 {
+ status = "okay";
+};
+
&usb_host0_ohci {
status = "okay";
@ -285,16 +277,11 @@ index e3a839a12dc6..ced3371f73c5 100644
&usb_host1_ehci {
status = "okay";
};
@@ -660,3 +844,45 @@ &usb_host1_ehci {
&usb_host1_ohci {
@@ -665,3 +841,40 @@ &usb_host1_ohci {
&usb_host2_xhci {
status = "okay";
};
+
+&usb_host2_xhci {
+ dr_mode = "host";
+ status = "okay";
+};
+
+&hdmi0 {
+ enable-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
+ status = "okay";
@ -331,7 +318,6 @@ index e3a839a12dc6..ced3371f73c5 100644
+ remote-endpoint = <&hdmi0_in_vp0>;
+ };
+};
\ No newline at end of file
--
Armbian
2.43.1

41
patch/kernel/rockchip-rk3588-edge/0027-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch
View File

@ -1,14 +1,14 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 54a207592a425697c5b81fa486062d10a551d223 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Thu, 16 Nov 2023 18:15:09 +0300
Subject: arm64: dts: Add missing nodes to Orange Pi 5 Plus
Subject: [PATCH] arm64: dts: Add missing nodes to Orange Pi 5 Plus
---
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 198 +++++++++-
1 file changed, 197 insertions(+), 1 deletion(-)
.../dts/rockchip/rk3588-orangepi-5-plus.dts | 189 +++++++++++++++++-
1 file changed, 188 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
index 298c183d6f4f..87803e6e0fa7 100644
index 3e660ff6cd5f..69cdc966d602 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
@@ -10,6 +10,7 @@
@ -19,7 +19,7 @@ index 298c183d6f4f..87803e6e0fa7 100644
#include "rk3588.dtsi"
/ {
@@ -159,6 +160,17 @@ daicodec: simple-audio-card,codec {
@@ -158,6 +159,17 @@ daicodec: simple-audio-card,codec {
};
};
@ -37,7 +37,7 @@ index 298c183d6f4f..87803e6e0fa7 100644
vcc3v3_pcie30: vcc3v3-pcie30-regulator {
compatible = "regulator-fixed";
enable-active-high;
@@ -200,6 +212,18 @@ vcc5v0_sys: vcc5v0-sys-regulator {
@@ -199,6 +211,18 @@ vcc5v0_sys: vcc5v0-sys-regulator {
regulator-max-microvolt = <5000000>;
};
@ -56,7 +56,7 @@ index 298c183d6f4f..87803e6e0fa7 100644
vcc5v0_usb20: vcc5v0-usb20-regulator {
compatible = "regulator-fixed";
enable-active-high;
@@ -227,34 +251,42 @@ &combphy2_psu {
@@ -226,34 +250,42 @@ &combphy2_psu {
&cpu_b0 {
cpu-supply = <&vdd_cpu_big0_s0>;
@ -99,7 +99,7 @@ index 298c183d6f4f..87803e6e0fa7 100644
};
&i2c0 {
@@ -312,6 +344,53 @@ hym8563: rtc@51 {
@@ -311,6 +343,53 @@ hym8563: rtc@51 {
pinctrl-0 = <&hym8563_int>;
wakeup-source;
};
@ -153,7 +153,7 @@ index 298c183d6f4f..87803e6e0fa7 100644
};
&i2c7 {
@@ -409,6 +488,14 @@ hp_detect: hp-detect {
@@ -408,6 +487,14 @@ hp_detect: hp-detect {
};
usb {
@ -168,7 +168,7 @@ index 298c183d6f4f..87803e6e0fa7 100644
vcc5v0_usb20_en: vcc5v0-usb20-en {
rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};
@@ -536,7 +623,7 @@ regulator-state-mem {
@@ -535,7 +622,7 @@ regulator-state-mem {
};
};
@ -177,7 +177,7 @@ index 298c183d6f4f..87803e6e0fa7 100644
regulator-name = "vdd_cpu_lit_s0";
regulator-always-on;
regulator-boot-on;
@@ -803,6 +890,22 @@ &tsadc {
@@ -802,6 +889,22 @@ &tsadc {
status = "okay";
};
@ -200,7 +200,7 @@ index 298c183d6f4f..87803e6e0fa7 100644
&u2phy2 {
status = "okay";
};
@@ -831,6 +934,44 @@ &uart9 {
@@ -830,6 +933,35 @@ &uart9 {
status = "okay";
};
@ -228,24 +228,15 @@ index 298c183d6f4f..87803e6e0fa7 100644
+ };
+};
+
+&usbdp_phy0_u3 {
+ status = "okay";
+};
+
+&usbdp_phy1 {
+ rockchip,dp-lane-mux = <2 3>;
+ status = "okay";
+};
+
+&usbdp_phy1_u3 {
+ status = "okay";
+};
+
+
&usb_host0_ehci {
status = "okay";
};
@@ -839,6 +980,20 @@ &usb_host0_ohci {
@@ -838,6 +970,20 @@ &usb_host0_ohci {
status = "okay";
};
@ -266,7 +257,7 @@ index 298c183d6f4f..87803e6e0fa7 100644
&usb_host1_ehci {
status = "okay";
};
@@ -846,3 +1001,44 @@ &usb_host1_ehci {
@@ -845,3 +991,44 @@ &usb_host1_ehci {
&usb_host1_ohci {
status = "okay";
};
@ -312,5 +303,5 @@ index 298c183d6f4f..87803e6e0fa7 100644
+ };
+};
--
Armbian
2.43.1

155
patch/kernel/rockchip-rk3588-edge/0030-Add-HDMI-and-VOP2-to-Rock-5-series.patch
View File

@ -1,155 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Sat, 2 Dec 2023 12:32:54 +0300
Subject: Add HDMI and VOP2 to Rock 5 series
---
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 49 ++++++++++
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 49 ++++++++++
2 files changed, 98 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 9ee415e6f498..1b741b5ca81b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -5,6 +5,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/usb/pd.h>
+#include <dt-bindings/soc/rockchip,vop2.h>
#include "rk3588.dtsi"
/ {
@@ -60,6 +61,17 @@ fan: pwm-fan {
#cooling-cells = <2>;
};
+ hdmi-con {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_con_in: endpoint {
+ remote-endpoint = <&hdmi0_out_con>;
+ };
+ };
+ };
+
vcc12v_dcin: vcc12v-dcin-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin";
@@ -920,3 +932,40 @@ &usb_host1_xhci {
&usb_host2_xhci {
status = "okay";
};
+
+&hdmi0 {
+ enable-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
+
+&hdptxphy_hdmi0 {
+ status = "okay";
+};
+
+&vop_mmu {
+ status = "okay";
+};
+
+&hdmi0_in {
+ hdmi0_in_vp0: endpoint {
+ remote-endpoint = <&vp0_out_hdmi0>;
+ };
+};
+
+&hdmi0_out {
+ hdmi0_out_con: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+};
+
+&vop {
+ status = "okay";
+};
+
+&vp0 {
+ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+ reg = <ROCKCHIP_VOP2_EP_HDMI0>;
+ remote-endpoint = <&hdmi0_in_vp0>;
+ };
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index 58c58ec03a7f..783a11493cd2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -5,6 +5,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/soc/rockchip,vop2.h>
#include "rk3588s.dtsi"
/ {
@@ -56,6 +57,17 @@ fan: pwm-fan {
#cooling-cells = <2>;
};
+ hdmi-con {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_con_in: endpoint {
+ remote-endpoint = <&hdmi0_out_con>;
+ };
+ };
+ };
+
vcc12v_dcin: vcc12v-dcin-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin";
@@ -772,3 +784,40 @@ &usb_host1_ohci {
&usb_host2_xhci {
status = "okay";
};
+
+&hdmi0 {
+ enable-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
+
+&hdptxphy_hdmi0 {
+ status = "okay";
+};
+
+&vop_mmu {
+ status = "okay";
+};
+
+&hdmi0_in {
+ hdmi0_in_vp0: endpoint {
+ remote-endpoint = <&vp0_out_hdmi0>;
+ };
+};
+
+&hdmi0_out {
+ hdmi0_out_con: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+};
+
+&vop {
+ status = "okay";
+};
+
+&vp0 {
+ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+ reg = <ROCKCHIP_VOP2_EP_HDMI0>;
+ remote-endpoint = <&hdmi0_in_vp0>;
+ };
+};
--
Armbian

0
patch/kernel/rockchip-rk3588-edge/0032-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch → patch/kernel/rockchip-rk3588-edge/0030-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch
View File

82
patch/kernel/rockchip-rk3588-edge/0031-Add-HDMI-and-VOP2-to-Rock-5A.patch Normal file
View File

@ -0,0 +1,82 @@
From 77b6e6e4d1d1791e2dcfb7014601a4d727a2bce9 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Tue, 27 Feb 2024 16:04:42 +0300
Subject: [PATCH] Add HDMI and VOP2 to Rock 5A
---
.../boot/dts/rockchip/rk3588s-rock-5a.dts | 48 +++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index a9ad9d2d54ae..e62eacbd54f6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -5,6 +5,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/soc/rockchip,vop2.h>
#include "rk3588s.dtsi"
/ {
@@ -56,6 +57,17 @@ fan: pwm-fan {
#cooling-cells = <2>;
};
+ hdmi-con {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_con_in: endpoint {
+ remote-endpoint = <&hdmi0_out_con>;
+ };
+ };
+ };
+
vcc12v_dcin: vcc12v-dcin-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin";
@@ -768,3 +780,39 @@ &usb_host1_ohci {
&usb_host2_xhci {
status = "okay";
};
+
+&hdmi0 {
+ enable-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
+&hdptxphy_hdmi0 {
+ status = "okay";
+};
+
+&vop_mmu {
+ status = "okay";
+};
+
+&hdmi0_in {
+ hdmi0_in_vp0: endpoint {
+ remote-endpoint = <&vp0_out_hdmi0>;
+ };
+};
+
+&hdmi0_out {
+ hdmi0_out_con: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+};
+
+&vop {
+ status = "okay";
+};
+
+&vp0 {
+ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+ reg = <ROCKCHIP_VOP2_EP_HDMI0>;
+ remote-endpoint = <&hdmi0_in_vp0>;
+ };
+};
--
2.43.1

82
patch/kernel/rockchip-rk3588-edge/0032-Add-HDMI-and-VOP2-to-Rock-5B.patch Normal file
View File

@ -0,0 +1,82 @@
From f1cc29e5eb612607c6c2bf3a4a479018220e8632 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Tue, 27 Feb 2024 16:08:14 +0300
Subject: [PATCH] Add HDMI and VOP2 to Rock 5B
---
.../boot/dts/rockchip/rk3588-rock-5b.dts | 48 +++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 8daf44c2e57c..e1aca314b901 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -4,6 +4,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
+#include <dt-bindings/soc/rockchip,vop2.h>
#include "rk3588.dtsi"
/ {
@@ -65,6 +66,17 @@ rfkill {
shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
};
+ hdmi-con {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_con_in: endpoint {
+ remote-endpoint = <&hdmi0_out_con>;
+ };
+ };
+ };
+
vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {
compatible = "regulator-fixed";
enable-active-high;
@@ -809,3 +821,39 @@ &usb_host1_xhci {
&usb_host2_xhci {
status = "okay";
};
+
+&hdmi0 {
+ enable-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
+&hdptxphy_hdmi0 {
+ status = "okay";
+};
+
+&vop_mmu {
+ status = "okay";
+};
+
+&hdmi0_in {
+ hdmi0_in_vp0: endpoint {
+ remote-endpoint = <&vp0_out_hdmi0>;
+ };
+};
+
+&hdmi0_out {
+ hdmi0_out_con: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+};
+
+&vop {
+ status = "okay";
+};
+
+&vp0 {
+ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+ reg = <ROCKCHIP_VOP2_EP_HDMI0>;
+ remote-endpoint = <&hdmi0_in_vp0>;
+ };
+};
--
2.43.1

4
patch/kernel/rockchip-rk3588-edge/dt/rk3588-hinlink-h88k.dts
View File

@ -793,10 +793,6 @@
status = "okay";
};
&usbdp_phy1_u3 {
status = "okay";
};
&usb_host0_ehci {
status = "okay";
};

4
patch/kernel/rockchip-rk3588-edge/dt/rk3588s-nanopi-r6s.dts
View File

@ -838,10 +838,6 @@
status = "okay";
};
&usbdp_phy0_u3 {
status = "okay";
};
&hdmi0 {
enable-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
status = "okay";