Sync helios64 to its updated 6.9 dts

Also move most node in the same order as upstream to lower the work
required to sync.
This commit is contained in:
Alban Browaeys 2024-06-08 04:57:01 +02:00 committed by Igor
parent 26345f03d0
commit cbaf67f007
4 changed files with 329 additions and 665 deletions

View File

@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 4244bd791ab2fe68abebc1b6bf71ffbc02535828 Mon Sep 17 00:00:00 2001
From: Aditya Prayoga <aprayoga@users.noreply.github.com> From: Aditya Prayoga <aprayoga@users.noreply.github.com>
Date: Thu, 4 Mar 2021 10:39:40 +0700 Date: Thu, 4 Mar 2021 10:39:40 +0700
Subject: [ARCHEOLOGY] Attempt to improve stability on Helios64 (#2680) Subject: [PATCH] Attempt to improve stability on Helios64 (#2680)
> X-Git-Archeology: > recovered message: > * Adjust the RK808 buck step to improve stability > X-Git-Archeology: > recovered message: > * Adjust the RK808 buck step to improve stability
> X-Git-Archeology: > recovered message: > * Adjust vdd_log and enable vdd_center init voltage > X-Git-Archeology: > recovered message: > * Adjust vdd_log and enable vdd_center init voltage
@ -56,17 +56,17 @@ Subject: [ARCHEOLOGY] Attempt to improve stability on Helios64 (#2680)
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
index ac0da7b7f43c..38bf0f583f44 100644 index 09e2cfe40696..4cb72981809a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
@@ -478,6 +478,7 @@ rk808: pmic@1b { @@ -522,6 +522,7 @@ rk808: pmic@1b {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int_l>; pinctrl-0 = <&pmic_int_l>;
rockchip,system-power-controller; rockchip,system-power-controller;
+ max-buck-steps-per-change = <4>; + max-buck-steps-per-change = <4>;
wakeup-source;
vcc1-supply = <&vcc5v0_sys>; vcc1-supply = <&vcc5v0_sys>;
vcc2-supply = <&vcc5v0_sys>;
-- --
Armbian 2.43.0

View File

@ -1,32 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aditya Prayoga <aditya@kobol.io>
Date: Mon, 7 Sep 2020 20:29:43 +0700
Subject: Remove overclock from helios64
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
index 38bf0f583f44..e1994a72e308 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
@@ -1152,4 +1152,12 @@ &vopl {
&vopl_mmu {
status = "okay";
-};
\ No newline at end of file
+};
+
+&cluster0_opp {
+ /delete-node/ opp06;
+};
+
+&cluster1_opp {
+ /delete-node/ opp08;
+};
--
Armbian

View File

@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 9fd42a26755ee7303a033c9c1fba3a492e0044f5 Mon Sep 17 00:00:00 2001
From: Aditya Prayoga <aditya@kobol.io> From: Aditya Prayoga <aditya@kobol.io>
Date: Tue, 15 Sep 2020 13:42:02 +0700 Date: Tue, 15 Sep 2020 13:42:02 +0700
Subject: Remove PCIE ep-gpios from Helios64 Subject: [PATCH] Remove PCIE ep-gpios from Helios64
Signed-off-by: Aditya Prayoga <aditya@kobol.io> Signed-off-by: Aditya Prayoga <aditya@kobol.io>
--- ---
@ -9,17 +9,17 @@ Signed-off-by: Aditya Prayoga <aditya@kobol.io>
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
index e1994a72e308..f4c50e5ce896 100644 index 4cb72981809a..824e7a4d8e40 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
@@ -771,7 +771,6 @@ &io_domains { @@ -820,7 +820,6 @@ &pcie_phy {
}; };
&pcie0 { &pcie0 {
- ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; - ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
num-lanes = <2>;
max-link-speed = <2>; max-link-speed = <2>;
num-lanes = <2>;
pinctrl-names = "default"; pinctrl-names = "default";
-- --
Armbian 2.43.0