From 25024984940b5f8e5c3e09d89f0fbea369859a1b Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Mon, 20 Oct 2025 19:17:46 +0200 Subject: [PATCH] rockchip64-6.18: drop upstreamed DT changes for R6*, T6, CM3588-NAS (USB3/HDMI-RX) - they landed upstream - our patches still apply (with fuzz), unfortunately - caught those by accident - probably there are more --- ...ip-add-USB3-support-to-NanoPi-R6-ser.patch | 49 ------------------ ...p-Enable-HDMI-receiver-on-CM3588-NAS.patch | 51 ------------------- ...ip-Enable-HDMI-receiver-on-NanoPC-T6.patch | 51 ------------------- 3 files changed, 151 deletions(-) delete mode 100644 patch/kernel/archive/rockchip64-6.18/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch delete mode 100644 patch/kernel/archive/rockchip64-6.18/rk3588-1090-arm64-dts-rockchip-Enable-HDMI-receiver-on-CM3588-NAS.patch delete mode 100644 patch/kernel/archive/rockchip64-6.18/rk3588-1091-arm64-dts-rockchip-Enable-HDMI-receiver-on-NanoPC-T6.patch diff --git a/patch/kernel/archive/rockchip64-6.18/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch deleted file mode 100644 index ca6b12b82..000000000 --- a/patch/kernel/archive/rockchip64-6.18/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muhammed Efe Cetin -Date: Tue, 10 Dec 2024 22:03:19 +0300 -Subject: arm64: dts: rockchip: add USB3 support to NanoPi R6 series boards - ---- - arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 19 ++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi -@@ -830,6 +830,15 @@ &u2phy0_otg { - status = "okay"; - }; - -+&u2phy0 { -+ status = "okay"; -+}; -+ -+&u2phy0_otg { -+ phy-supply = <&vcc5v0_usb_otg0>; -+ status = "okay"; -+}; -+ - &u2phy2 { - status = "okay"; - }; -@@ -861,6 +870,16 @@ &usbdp_phy0 { - status = "okay"; - }; - -+&usb_host0_xhci { -+ dr_mode = "host"; -+ extcon = <&u2phy0>; -+ status = "okay"; -+}; -+ -+&usbdp_phy0 { -+ status = "okay"; -+}; -+ - &vop { - status = "okay"; - }; --- -Armbian - diff --git a/patch/kernel/archive/rockchip64-6.18/rk3588-1090-arm64-dts-rockchip-Enable-HDMI-receiver-on-CM3588-NAS.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1090-arm64-dts-rockchip-Enable-HDMI-receiver-on-CM3588-NAS.patch deleted file mode 100644 index 0a49189a5..000000000 --- a/patch/kernel/archive/rockchip64-6.18/rk3588-1090-arm64-dts-rockchip-Enable-HDMI-receiver-on-CM3588-NAS.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ricardo Pardini -Date: Fri, 23 May 2025 15:33:24 +0200 -Subject: arm64: dts: rockchip: Enable HDMI receiver on CM3588-NAS - -The CM3588-NAS has a full-size HDMI port, which can be used for receiving -HDMI data. This enables support for it. - -Signed-off-by: Ricardo Pardini ---- - arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts | 17 ++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts -@@ -346,6 +346,17 @@ &hdmi_receiver { - status = "okay"; - }; - -+&hdmi_receiver_cma { -+ status = "okay"; -+}; -+ -+&hdmi_receiver { -+ hpd-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>; -+ pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_hpd>; -+ pinctrl-names = "default"; -+ status = "okay"; -+}; -+ - &hdptxphy0 { - status = "okay"; - }; -@@ -495,6 +506,12 @@ hdmirx_hpd: hdmirx-5v-detection { - }; - }; - -+ hdmirx { -+ hdmirx_hpd: hdmirx-5v-detection { -+ rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ }; -+ - pcie { - pcie2_0_rst: pcie2-0-rst { - rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; --- -Armbian - diff --git a/patch/kernel/archive/rockchip64-6.18/rk3588-1091-arm64-dts-rockchip-Enable-HDMI-receiver-on-NanoPC-T6.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1091-arm64-dts-rockchip-Enable-HDMI-receiver-on-NanoPC-T6.patch deleted file mode 100644 index dd0eb91c7..000000000 --- a/patch/kernel/archive/rockchip64-6.18/rk3588-1091-arm64-dts-rockchip-Enable-HDMI-receiver-on-NanoPC-T6.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ricardo Pardini -Date: Fri, 23 May 2025 18:00:28 +0200 -Subject: arm64: dts: rockchip: Enable HDMI receiver on NanoPC-T6 - -The NanoPC-T6 (and its LTS variant) has a full-size HDMI port, which can be used -for receiving HDMI data. This enables support for it. - -Signed-off-by: Ricardo Pardini ---- - arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 17 ++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi -@@ -410,6 +410,17 @@ &hdmi_receiver { - status = "okay"; - }; - -+&hdmi_receiver_cma { -+ status = "okay"; -+}; -+ -+&hdmi_receiver { -+ hpd-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>; -+ pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_hpd>; -+ pinctrl-names = "default"; -+ status = "okay"; -+}; -+ - &hdptxphy0 { - status = "okay"; - }; -@@ -682,6 +693,12 @@ hdmirx_hpd: hdmirx-5v-detection { - }; - }; - -+ hdmirx { -+ hdmirx_hpd: hdmirx-5v-detection { -+ rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ }; -+ - headphone { - hp_det: hp-det { - rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; --- -Armbian -