From cdfcd88dba8f69b6ef994d325ee77a83ad0a3b17 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Mon, 24 Nov 2025 19:01:13 +0000 Subject: [PATCH] rockchip64: remove upstreamed fixes --- .../board-orangepi5-sata-supply.patch | 11 ----- ...ockchip-remove-overclocked-CPU-OPP-t.patch | 43 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 patch/kernel/archive/rockchip64-6.18/rk3576-0004-arch-arm64-dts-rockchip-remove-overclocked-CPU-OPP-t.patch diff --git a/patch/kernel/archive/rockchip64-6.18/board-orangepi5-sata-supply.patch b/patch/kernel/archive/rockchip64-6.18/board-orangepi5-sata-supply.patch index 055c93f2af..6af9b556af 100644 --- a/patch/kernel/archive/rockchip64-6.18/board-orangepi5-sata-supply.patch +++ b/patch/kernel/archive/rockchip64-6.18/board-orangepi5-sata-supply.patch @@ -25,17 +25,6 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/bo index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts -@@ -14,8 +14,8 @@ vcc3v3_pcie20: regulator-vcc3v3-pcie20 { - gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - regulator-name = "vcc3v3_pcie20"; - regulator-boot-on; -- regulator-min-microvolt = <1800000>; -- regulator-max-microvolt = <1800000>; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; - startup-delay-us = <50000>; - vin-supply = <&vcc5v0_sys>; - }; @@ -27,6 +27,13 @@ &pcie2x1l2 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.18/rk3576-0004-arch-arm64-dts-rockchip-remove-overclocked-CPU-OPP-t.patch b/patch/kernel/archive/rockchip64-6.18/rk3576-0004-arch-arm64-dts-rockchip-remove-overclocked-CPU-OPP-t.patch deleted file mode 100644 index 87b5204379..0000000000 --- a/patch/kernel/archive/rockchip64-6.18/rk3576-0004-arch-arm64-dts-rockchip-remove-overclocked-CPU-OPP-t.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jianfeng Liu -Date: Wed, 1 Oct 2025 20:59:28 +0800 -Subject: arch: arm64: dts: rockchip: remove overclocked CPU OPP table on - rk3576 - ---- - arch/arm64/boot/dts/rockchip/rk3576.dtsi | 12 ---------- - 1 file changed, 12 deletions(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3576.dtsi b/arch/arm64/boot/dts/rockchip/rk3576.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3576.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3576.dtsi -@@ -276,12 +276,6 @@ opp-2016000000 { - opp-microvolt = <900000 900000 950000>; - clock-latency-ns = <40000>; - }; -- -- opp-2208000000 { -- opp-hz = /bits/ 64 <2208000000>; -- opp-microvolt = <950000 950000 950000>; -- clock-latency-ns = <40000>; -- }; - }; - - cluster1_opp_table: opp-table-cluster1 { -@@ -348,12 +342,6 @@ opp-2208000000 { - opp-microvolt = <925000 925000 950000>; - clock-latency-ns = <40000>; - }; -- -- opp-2304000000 { -- opp-hz = /bits/ 64 <2304000000>; -- opp-microvolt = <950000 950000 950000>; -- clock-latency-ns = <40000>; -- }; - }; - - gpu_opp_table: opp-table-gpu { --- -Armbian -