From b0a5d1794d05a8853dfa91d6adc58a76c6912698 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Fri, 12 Jul 2024 22:02:26 +0200 Subject: [PATCH] rockchip-rk3588 / edge: rebase onto `6.10-rc7` - **win**: notice how one can actually _spot_ revelevant changes now - case in point, `1022-arm64-dts-rockchip-support-poweroff-on-rock-5a.patch` -- will drop it in separate commit --- ...-RK3588-Add-Thermal-and-CpuFreq-Support.patch | 16 ++++++++-------- ...k-5b-Slow-down-emmc-to-hs200-and-add-ts.patch | 2 +- ...oard-rock-5b-arm64-dts-enable-spi-flash.patch | 2 +- ...64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch | 2 +- .../1020-Add-HDMI-and-VOP2-to-Rock-5A.patch | 2 +- ...h-arm64-dts-enable-gpu-node-for-rock-5a.patch | 2 +- ...s-Add-missing-nodes-to-Orange-Pi-5-Plus.patch | 8 ++++---- ...ts-rockchip-support-poweroff-on-rock-5a.patch | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/0022-RK3588-Add-Thermal-and-CpuFreq-Support.patch b/patch/kernel/archive/rockchip-rk3588-6.10/0022-RK3588-Add-Thermal-and-CpuFreq-Support.patch index cd61b6a935..502bd2a5f7 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.10/0022-RK3588-Add-Thermal-and-CpuFreq-Support.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.10/0022-RK3588-Add-Thermal-and-CpuFreq-Support.patch @@ -273,7 +273,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/d index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -742,6 +742,10 @@ regulator-state-mem { +@@ -743,6 +743,10 @@ regulator-state-mem { }; }; @@ -318,7 +318,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/ index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -@@ -697,6 +697,10 @@ regulator-state-mem { +@@ -699,6 +699,10 @@ regulator-state-mem { }; }; @@ -473,7 +473,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts b/arch/arm64/bo index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts -@@ -832,6 +832,8 @@ vdd_cpu_big1_s0: dcdc-reg1 { +@@ -833,6 +833,8 @@ vdd_cpu_big1_s0: dcdc-reg1 { regulator-name = "vdd_cpu_big1_s0"; regulator-always-on; regulator-boot-on; @@ -482,7 +482,7 @@ index 111111111111..222222222222 100644 regulator-min-microvolt = <550000>; regulator-max-microvolt = <1050000>; regulator-ramp-delay = <12500>; -@@ -845,6 +847,8 @@ vdd_cpu_big0_s0: dcdc-reg2 { +@@ -846,6 +848,8 @@ vdd_cpu_big0_s0: dcdc-reg2 { regulator-name = "vdd_cpu_big0_s0"; regulator-always-on; regulator-boot-on; @@ -491,7 +491,7 @@ index 111111111111..222222222222 100644 regulator-min-microvolt = <550000>; regulator-max-microvolt = <1050000>; regulator-ramp-delay = <12500>; -@@ -858,6 +862,8 @@ vdd_cpu_lit_s0: dcdc-reg3 { +@@ -859,6 +863,8 @@ vdd_cpu_lit_s0: dcdc-reg3 { regulator-name = "vdd_cpu_lit_s0"; regulator-always-on; regulator-boot-on; @@ -500,7 +500,7 @@ index 111111111111..222222222222 100644 regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; regulator-ramp-delay = <12500>; -@@ -884,6 +890,8 @@ vdd_cpu_big1_mem_s0: dcdc-reg5 { +@@ -885,6 +891,8 @@ vdd_cpu_big1_mem_s0: dcdc-reg5 { regulator-name = "vdd_cpu_big1_mem_s0"; regulator-always-on; regulator-boot-on; @@ -509,7 +509,7 @@ index 111111111111..222222222222 100644 regulator-min-microvolt = <675000>; regulator-max-microvolt = <1050000>; regulator-ramp-delay = <12500>; -@@ -898,6 +906,8 @@ vdd_cpu_big0_mem_s0: dcdc-reg6 { +@@ -899,6 +907,8 @@ vdd_cpu_big0_mem_s0: dcdc-reg6 { regulator-name = "vdd_cpu_big0_mem_s0"; regulator-always-on; regulator-boot-on; @@ -518,7 +518,7 @@ index 111111111111..222222222222 100644 regulator-min-microvolt = <675000>; regulator-max-microvolt = <1050000>; regulator-ramp-delay = <12500>; -@@ -924,6 +934,8 @@ vdd_cpu_lit_mem_s0: dcdc-reg8 { +@@ -925,6 +935,8 @@ vdd_cpu_lit_mem_s0: dcdc-reg8 { regulator-name = "vdd_cpu_lit_mem_s0"; regulator-always-on; regulator-boot-on; diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch b/patch/kernel/archive/rockchip-rk3588-6.10/1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch index ed7d4f3f3e..326476f8c1 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.10/1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.10/1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch @@ -21,7 +21,7 @@ index 111111111111..222222222222 100644 status = "okay"; }; -@@ -411,6 +410,10 @@ &sdio { +@@ -412,6 +411,10 @@ &sdio { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/1011-board-rock-5b-arm64-dts-enable-spi-flash.patch b/patch/kernel/archive/rockchip-rk3588-6.10/1011-board-rock-5b-arm64-dts-enable-spi-flash.patch index 22a681873e..bcf1f9460e 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.10/1011-board-rock-5b-arm64-dts-enable-spi-flash.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.10/1011-board-rock-5b-arm64-dts-enable-spi-flash.patch @@ -13,7 +13,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/d index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -420,6 +420,33 @@ &uart6 { +@@ -421,6 +421,33 @@ &uart6 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/1012-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch b/patch/kernel/archive/rockchip-rk3588-6.10/1012-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch index da741a15b6..618d12de80 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.10/1012-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.10/1012-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch @@ -43,7 +43,7 @@ index 111111111111..222222222222 100644 &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0m2_xfer>; -@@ -836,3 +851,18 @@ &usb_host1_xhci { +@@ -837,3 +852,18 @@ &usb_host1_xhci { &usb_host2_xhci { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch b/patch/kernel/archive/rockchip-rk3588-6.10/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch index 6933509af3..e26dc7a343 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.10/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.10/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch @@ -19,7 +19,7 @@ index 111111111111..222222222222 100644 #include "rk3588s.dtsi" / { -@@ -763,3 +764,32 @@ &usb_host1_ohci { +@@ -765,3 +766,32 @@ &usb_host1_ohci { &usb_host2_xhci { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch b/patch/kernel/archive/rockchip-rk3588-6.10/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch index 7c4e2fc306..da231f67ce 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.10/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.10/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch @@ -23,7 +23,7 @@ index 111111111111..222222222222 100644 &mdio1 { rgmii_phy1: ethernet-phy@1 { /* RTL8211F */ -@@ -432,6 +437,7 @@ rk806_dvs3_null: dvs3-null-pins { +@@ -434,6 +439,7 @@ rk806_dvs3_null: dvs3-null-pins { regulators { vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 { regulator-name = "vdd_gpu_s0"; diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch b/patch/kernel/archive/rockchip-rk3588-6.10/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch index 1a45203a18..32653f4a15 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.10/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.10/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch @@ -137,7 +137,7 @@ index 111111111111..222222222222 100644 vcc5v0_usb20_en: vcc5v0-usb20-en { rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; }; -@@ -802,6 +884,22 @@ &tsadc { +@@ -803,6 +885,22 @@ &tsadc { status = "okay"; }; @@ -160,7 +160,7 @@ index 111111111111..222222222222 100644 &u2phy2 { status = "okay"; }; -@@ -830,6 +928,35 @@ &uart9 { +@@ -831,6 +929,35 @@ &uart9 { status = "okay"; }; @@ -196,7 +196,7 @@ index 111111111111..222222222222 100644 &usb_host0_ehci { status = "okay"; }; -@@ -838,6 +965,20 @@ &usb_host0_ohci { +@@ -839,6 +966,20 @@ &usb_host0_ohci { status = "okay"; }; @@ -217,7 +217,7 @@ index 111111111111..222222222222 100644 &usb_host1_ehci { status = "okay"; }; -@@ -845,3 +986,42 @@ &usb_host1_ehci { +@@ -846,3 +987,42 @@ &usb_host1_ehci { &usb_host1_ohci { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/1022-arm64-dts-rockchip-support-poweroff-on-rock-5a.patch b/patch/kernel/archive/rockchip-rk3588-6.10/1022-arm64-dts-rockchip-support-poweroff-on-rock-5a.patch index c68459f6cd..0f9bb55163 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.10/1022-arm64-dts-rockchip-support-poweroff-on-rock-5a.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.10/1022-arm64-dts-rockchip-support-poweroff-on-rock-5a.patch @@ -11,9 +11,9 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/ index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -@@ -400,6 +400,8 @@ pmic@0 { - <&rk806_dvs2_null>, <&rk806_dvs3_null>; +@@ -402,6 +402,8 @@ pmic@0 { spi-max-frequency = <1000000>; + system-power-controller; + system-power-controller; +