From ee03f26b8c5e4f5c22913f78db0af482cf60c160 Mon Sep 17 00:00:00 2001 From: Alban Browaeys Date: Sat, 8 Jun 2024 04:57:01 +0200 Subject: [PATCH] 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. --- ...atch.disabled => add-board-helios64.patch} | 876 ++++++------------ ...d-helios64-dts-fix-stability-issues.patch} | 12 +- ...d-helios64-remove-overclock.patch.disabled | 32 - ...board-helios64-remove-pcie-ep-gpios.patch} | 12 +- 4 files changed, 298 insertions(+), 634 deletions(-) rename patch/kernel/archive/rockchip64-6.9/{add-board-helios64.patch.disabled => add-board-helios64.patch} (62%) rename patch/kernel/archive/rockchip64-6.9/{board-helios64-dts-fix-stability-issues.patch.disabled => board-helios64-dts-fix-stability-issues.patch} (94%) delete mode 100644 patch/kernel/archive/rockchip64-6.9/board-helios64-remove-overclock.patch.disabled rename patch/kernel/archive/rockchip64-6.9/{board-helios64-remove-pcie-ep-gpios.patch.disabled => board-helios64-remove-pcie-ep-gpios.patch} (76%) diff --git a/patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch.disabled b/patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch similarity index 62% rename from patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch.disabled rename to patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch index dad98b225b3b..be107a49e16a 100644 --- a/patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch.disabled +++ b/patch/kernel/archive/rockchip64-6.9/add-board-helios64.patch @@ -1,7 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 98834ee2745daea7ee9c2f620acc1d09a4da2cdc Mon Sep 17 00:00:00 2001 From: Aditya Prayoga Date: Tue, 15 Sep 2020 20:04:22 +0700 -Subject: Add board Helios64 +Subject: [PATCH] Add board Helios64 note: rpardini: this patch was rebased on top of 6.3.1, finally admitting that it used to blindly overwrite the mainline dts (it was added when helios64 @@ -10,25 +10,14 @@ is the complete set of changes actually done. Signed-off-by: Aditya Prayoga --- - arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 996 +++++++--- - 1 file changed, 764 insertions(+), 232 deletions(-) + .../dts/rockchip/rk3399-kobol-helios64.dts | 735 ++++++++++++++++-- + 1 file changed, 654 insertions(+), 81 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts -index 9995549873d3..69d76dea35d0 100644 +index 9586bb12a5d8..09e2cfe40696 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts -@@ -1,54 +1,37 @@ - // SPDX-License-Identifier: (GPL-2.0+ OR MIT) - /* -- * Copyright (c) 2020 Aditya Prayoga -- */ -- --/* -- * The Kobol Helios64 is a board designed to operate as a NAS and optionally -- * ships with an enclosing that can host five 2.5" hard disks. -- * -- * See https://wiki.kobol.io/helios64/intro/ for further details. -+ * Copyright (c) 2020 Aditya Prayoga (aditya@kobol.io) +@@ -11,6 +11,10 @@ */ /dts-v1/; @@ -39,38 +28,10 @@ index 9995549873d3..69d76dea35d0 100644 #include "rk3399.dtsi" #include "rk3399-opp.dtsi" - / { -- model = "Kobol Helios64"; -+ model = "Helios64"; - compatible = "kobol,helios64", "rockchip,rk3399"; +@@ -48,6 +52,25 @@ chosen { + stdout-path = "serial2:1500000n8"; + }; -- aliases { -- ethernet0 = &gmac; -- mmc0 = &sdmmc; -- mmc1 = &sdhci; -- spi1 = &spi1; -- spi2 = &spi2; -- spi5 = &spi5; -- }; -- -- avdd_0v9_s0: avdd-0v9-s0 { -- compatible = "regulator-fixed"; -- regulator-name = "avdd_0v9_s0"; -- regulator-always-on; -- regulator-boot-on; -- regulator-min-microvolt = <900000>; -- regulator-max-microvolt = <900000>; -- vin-supply = <&vcc1v8_sys_s3>; -- }; -- -- avdd_1v8_s0: avdd-1v8-s0 { -- compatible = "regulator-fixed"; -- regulator-name = "avdd_1v8_s0"; -- regulator-always-on; -- regulator-boot-on; -- regulator-min-microvolt = <1800000>; -- regulator-max-microvolt = <1800000>; -- vin-supply = <&vcc3v3_sys_s3>; + adc-keys { + compatible = "adc-keys"; + io-channels = <&saradc 1>; @@ -83,198 +44,200 @@ index 9995549873d3..69d76dea35d0 100644 + linux,code = ; + press-threshold-microvolt = <100000>; + }; - }; - -- chosen { -- stdout-path = "serial2:1500000n8"; ++ }; ++ + beeper: beeper { + compatible = "gpio-beeper"; + gpios = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>; - }; - ++ }; ++ clkin_gmac: external-gmac-clock { -@@ -57,107 +41,86 @@ clkin_gmac: external-gmac-clock { + compatible = "fixed-clock"; + clock-frequency = <125000000>; +@@ -55,35 +78,119 @@ clkin_gmac: external-gmac-clock { #clock-cells = <0>; }; - fan1 { -- /* fan connected to P7 */ -- compatible = "pwm-fan"; -- pwms = <&pwm0 0 40000 0>; -- cooling-levels = <0 80 170 255>; -- }; -- ++ fan1: p7-fan { + /* fan connected to P7 */ + compatible = "pwm-fan"; + pwms = <&pwm0 0 40000 0>; ++ cooling-min-state = <0>; ++ cooling-max-state = <3>; ++ #cooling-cells = <2>; + cooling-levels = <0 80 170 255>; + }; + - fan2 { -- /* fan connected to P6 */ -- compatible = "pwm-fan"; -- pwms = <&pwm1 0 40000 0>; -- cooling-levels = <0 80 170 255>; -+ vcc12v_dcin: vcc12v-dcin { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc12v_dcin"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <12000000>; -+ regulator-max-microvolt = <12000000>; ++ fan2: p6-fan { + /* fan connected to P6 */ + compatible = "pwm-fan"; + pwms = <&pwm1 0 40000 0>; ++ cooling-min-state = <0>; ++ cooling-max-state = <3>; ++ #cooling-cells = <2>; + cooling-levels = <0 80 170 255>; }; - leds { -- compatible = "gpio-leds"; -- pinctrl-names = "default"; ++ io_leds: io-gpio-leds { ++ status = "okay"; + compatible = "gpio-leds"; + pinctrl-names = "default"; - pinctrl-0 = <&sys_grn_led_on &sys_red_led_on>; -- ++ pinctrl-0 = <&network_act>, <&usb3_act>, ++ <&sata_act>, <&sata_err_led>; ++ ++ network { ++ label = "helios64:blue:net"; ++ gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "netdev"; ++ default-state = "off"; ++ }; ++ ++ sata { ++ label = "helios64:blue:hdd-status"; ++ gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "disk-activity"; ++ default-state = "off"; ++ }; ++ ++ sata_err1 { ++ label = "helios64:red:ata1-err"; ++ gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_HIGH>; ++ default-state = "keep"; ++ }; ++ ++ sata_err2 { ++ label = "helios64:red:ata2-err"; ++ gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_HIGH>; ++ default-state = "keep"; ++ }; ++ ++ sata_err3 { ++ label = "helios64:red:ata3-err"; ++ gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>; ++ default-state = "keep"; ++ }; ++ ++ sata_err4 { ++ label = "helios64:red:ata4-err"; ++ gpios = <&gpio2 RK_PA5 GPIO_ACTIVE_HIGH>; ++ default-state = "keep"; ++ }; + - led-0 { -- label = "helios64:green:status"; -- gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; -- default-state = "on"; -- }; -- ++ sata_err5 { ++ label = "helios64:red:ata5-err"; ++ gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>; ++ default-state = "keep"; ++ }; ++ ++ usb3 { ++ label = "helios64:blue:usb3"; ++ gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; ++ trigger-sources = <&int_hub_port1>, ++ <&int_hub_port2>, ++ <&int_hub_port3>; ++ linux,default-trigger = "usbport"; ++ default-state = "off"; ++ }; ++ }; ++ ++ pwmleds { ++ compatible = "pwm-leds"; ++ status = "okay"; ++ ++ power-led { ++ label = "helios64:blue:power-status"; ++ pwms = <&pwm3 0 2000000000 0>; ++ max-brightness = <255>; ++ }; ++ }; ++ ++ system_leds: system-gpio-leds { ++ status = "okay"; ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&system_led>; ++ ++ status-led { + label = "helios64:green:status"; + gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "none"; + default-state = "on"; ++ mode = <0x23>; + }; + - led-1 { -- label = "helios64:red:fault"; -- gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; -- default-state = "keep"; -- }; -+ vcc12v_dcin_bkup: vcc12v-dcin-bkup { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc12v_dcin_bkup"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <12000000>; -+ regulator-max-microvolt = <12000000>; -+ vin-supply = <&vcc12v_dcin>; ++ fault-led { + label = "helios64:red:fault"; + gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "panic"; + default-state = "keep"; ++ mode = <0x23>; + }; }; -- hdd_a_power: hdd-a-power { -+ vcc12v_hdd: vcc12v-hdd { +@@ -115,7 +222,7 @@ pcie_power: pcie-power { compatible = "regulator-fixed"; -- enable-active-high; -- gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; -- pinctrl-0 = <&hdd_a_power_en>; -- pinctrl-names = "default"; -+ regulator-name = "vcc12v_hdd"; - regulator-always-on; + enable-active-high; + gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; +- pinctrl-0 = <&pcie_pwr>; ++ pinctrl-0 = <&pcie_pwr_en>; + pinctrl-names = "default"; regulator-boot-on; -- regulator-name = "hdd_a_power"; -- startup-delay-us = <2000000>; -+ regulator-min-microvolt = <12000000>; -+ regulator-max-microvolt = <12000000>; -+ vin-supply = <&vcc12v_dcin_bkup>; + regulator-name = "pcie_power"; +@@ -135,6 +242,7 @@ usblan_power: usblan-power { + vin-supply = <&vcc5v0_usb>; }; -- hdd_b_power: hdd-b-power { + /* switched by pmic_sleep */ -+ vcc1v8_sys_s0: vcc1v8-sys-s0 { + vcc1v8_sys_s0: vcc1v8-sys-s0 { compatible = "regulator-fixed"; -- enable-active-high; -- gpio = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; -- pinctrl-0 = <&hdd_b_power_en>; -- pinctrl-names = "default"; -+ regulator-name = "vcc1v8_sys_s0"; - regulator-always-on; - regulator-boot-on; -- regulator-name = "hdd_b_power"; -- startup-delay-us = <2000000>; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ vin-supply = <&vcc1v8_sys_s3>; + regulator-name = "vcc1v8_sys_s0"; +@@ -145,6 +253,36 @@ vcc1v8_sys_s0: vcc1v8-sys-s0 { + vin-supply = <&vcc1v8_sys_s3>; }; -- pcie_power: pcie-power { + vcc0v9_s3: vcc0v9-s3 { - compatible = "regulator-fixed"; -- enable-active-high; -- gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; -- pinctrl-0 = <&pcie_pwr>; -- pinctrl-names = "default"; ++ compatible = "regulator-fixed"; + regulator-name = "vcc0v9_s3"; + regulator-always-on; - regulator-boot-on; -- regulator-name = "pcie_power"; -- startup-delay-us = <10000>; -- vin-supply = <&vcc5v0_perdev>; ++ regulator-boot-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + vin-supply = <&vcc3v3_sys_s3>; - }; - -- usblan_power: usblan-power { ++ }; ++ + avdd_0v9_s0: avdd-0v9-s0 { - compatible = "regulator-fixed"; -- enable-active-high; -- gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; -- pinctrl-names = "default"; -- pinctrl-0 = <&usb_lan_en>; -- regulator-name = "usblan_power"; ++ compatible = "regulator-fixed"; + regulator-name = "avdd_0v9_s0"; - regulator-always-on; - regulator-boot-on; -- vin-supply = <&vcc5v0_usb>; ++ regulator-always-on; ++ regulator-boot-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + vin-supply = <&vcc1v8_sys_s3>; - }; - -- vcc1v8_sys_s0: vcc1v8-sys-s0 { -+ avdd_1v8_s0: avdd-1v8-s0 { - compatible = "regulator-fixed"; -- regulator-name = "vcc1v8_sys_s0"; -+ regulator-name = "avdd_1v8_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; -- vin-supply = <&vcc1v8_sys_s3>; -+ vin-supply = <&vcc3v3_sys_s3>; - }; - -- vcc3v0_sd: vcc3v0-sd { -+ pcie_power: pcie-power { - compatible = "regulator-fixed"; - enable-active-high; -- gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; -- regulator-name = "vcc3v0_sd"; -- regulator-boot-on; -- regulator-min-microvolt = <3000000>; -- regulator-max-microvolt = <3000000>; -+ gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; -- pinctrl-0 = <&sdmmc0_pwr_h>; -- vin-supply = <&vcc3v3_sys_s3>; -+ pinctrl-0 = <&pcie_pwr_en>; -+ regulator-name = "pcie_power"; -+ regulator-boot-on; -+ startup-delay-us = <10000>; -+ vin-supply = <&vcc5v0_perdev>; - }; - - vcc3v3_sys_s3: vcc_lan: vcc3v3-sys-s3 { -@@ -174,6 +137,39 @@ regulator-state-mem { - }; - }; - -+ vcc3v0_sd: vcc3v0-sd { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v0_sd"; -+ regulator-boot-on; -+ regulator-min-microvolt = <3000000>; -+ regulator-max-microvolt = <3000000>; -+ vin-supply = <&vcc3v3_sys_s3>; + }; + -+ vcc5v0_usb: vcc5v0-usb { ++ avdd_1v8_s0: avdd-1v8-s0 { + compatible = "regulator-fixed"; -+ enable-active-high; -+ gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vcc5v0_usb_en>; -+ regulator-name = "vcc5v0_usb"; ++ regulator-name = "avdd_1v8_s0"; + regulator-always-on; + regulator-boot-on; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&vcc5v0_perdev>; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vcc3v3_sys_s3>; + }; + + vcc3v0_sd: vcc3v0-sd { + compatible = "regulator-fixed"; + enable-active-high; +@@ -210,6 +346,36 @@ vcc5v0_usb: vcc5v0-usb { + vin-supply = <&vcc5v0_perdev>; + }; + + vcc5v0_typec: vcc5v0-typec-regulator { + compatible = "regulator-fixed"; + enable-active-high; @@ -285,13 +248,6 @@ index 9995549873d3..69d76dea35d0 100644 + vin-supply = <&vcc5v0_usb>; + }; + - vcc5v0_perdev: vcc5v0-perdev { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_perdev"; -@@ -184,6 +180,16 @@ vcc5v0_perdev: vcc5v0-perdev { - vin-supply = <&vcc12v_dcin_bkup>; - }; - + vcc5v0_hdd: vcc5v0-hdd { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_hdd"; @@ -302,76 +258,22 @@ index 9995549873d3..69d76dea35d0 100644 + vin-supply = <&vcc12v_dcin_bkup>; + }; + - vcc5v0_sys: vcc5v0-sys { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; -@@ -198,68 +204,213 @@ regulator-state-mem { - }; - }; - -- vcc5v0_usb: vcc5v0-usb { -+ vdd_log: vdd-log { -+ compatible = "pwm-regulator"; -+ pwms = <&pwm2 0 25000 1>; -+ pwm-supply = <&vcc5v0_sys>; -+ regulator-name = "vdd_log"; ++ vcc12v_hdd: vcc12v-hdd { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc12v_hdd"; + regulator-always-on; + regulator-boot-on; -+ regulator-min-microvolt = <830000>; -+ regulator-max-microvolt = <1400000>; -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <900000>; -+ }; ++ regulator-min-microvolt = <12000000>; ++ regulator-max-microvolt = <12000000>; ++ vin-supply = <&vcc12v_dcin_bkup>; + }; + -+ power_hdd_a: power-hdd-a { + vcc12v_dcin: vcc12v-dcin { compatible = "regulator-fixed"; - enable-active-high; -- gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; -+ gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; -- pinctrl-0 = <&vcc5v0_usb_en>; -- regulator-name = "vcc5v0_usb"; -+ pinctrl-0 = <&hdd_a_power>; -+ regulator-name = "power_hdd_a"; - regulator-always-on; - regulator-boot-on; -- regulator-min-microvolt = <5000000>; -- regulator-max-microvolt = <5000000>; -- vin-supply = <&vcc5v0_perdev>; - }; - -- vcc12v_dcin: vcc12v-dcin { -+ power_hdd_b: power-hdd-b { - compatible = "regulator-fixed"; -- regulator-name = "vcc12v_dcin"; -+ enable-active-high; -+ gpio = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&hdd_b_power>; -+ regulator-name = "power_hdd_b"; - regulator-always-on; - regulator-boot-on; -- regulator-min-microvolt = <12000000>; -- regulator-max-microvolt = <12000000>; - }; - -- vcc12v_dcin_bkup: vcc12v-dcin-bkup { -+ usblan_power: usblan-power { - compatible = "regulator-fixed"; -- regulator-name = "vcc12v_dcin_bkup"; -+ enable-active-high; -+ gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&usb_lan_en>; -+ regulator-name = "usblan_power"; - regulator-always-on; - regulator-boot-on; -- regulator-min-microvolt = <12000000>; -- regulator-max-microvolt = <12000000>; -- vin-supply = <&vcc12v_dcin>; -+ vin-supply = <&vcc5v0_usb>; + regulator-name = "vcc12v_dcin"; +@@ -228,36 +394,60 @@ vcc12v_dcin_bkup: vcc12v-dcin-bkup { + regulator-max-microvolt = <12000000>; + vin-supply = <&vcc12v_dcin>; }; -}; @@ -386,13 +288,19 @@ index 9995549873d3..69d76dea35d0 100644 - /delete-node/ opp03; - /delete-node/ opp04; -}; -+ fan1: p7-fan { -+ compatible = "pwm-fan"; -+ pwms = <&pwm0 0 40000 0>; -+ cooling-min-state = <0>; -+ cooling-max-state = <3>; -+ #cooling-cells = <2>; -+ cooling-levels = <0 80 170 255>; ++ vdd_log: vdd-log { ++ compatible = "pwm-regulator"; ++ pwms = <&pwm2 0 25000 1>; ++ pwm-supply = <&vcc5v0_sys>; ++ regulator-name = "vdd_log"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <830000>; ++ regulator-max-microvolt = <1400000>; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <900000>; ++ }; + }; -&cluster1_opp { @@ -404,17 +312,6 @@ index 9995549873d3..69d76dea35d0 100644 - /delete-node/ opp05; - /delete-node/ opp06; -}; -+ fan2: p6-fan { -+ compatible = "pwm-fan"; -+ pwms = <&pwm1 0 40000 0>; -+ cooling-min-state = <0>; -+ cooling-max-state = <3>; -+ #cooling-cells = <2>; -+ cooling-levels = <0 80 170 255>; -+ }; - --&cpu_b0 { -- cpu-supply = <&vdd_cpu_b>; + gpio-charger { + compatible = "gpio-charger"; + charger-type = "mains"; @@ -423,7 +320,10 @@ index 9995549873d3..69d76dea35d0 100644 + pinctrl-names = "default"; + pinctrl-0 = <&ac_present_ap>, <&charger_status>; + }; -+ + +-&cpu_b0 { +- cpu-supply = <&vdd_cpu_b>; +-}; + gpio-keys { + compatible = "gpio-keys"; + autorepeat; @@ -437,7 +337,9 @@ index 9995549873d3..69d76dea35d0 100644 + linux,code = ; + wakeup-source; + }; -+ + +-&cpu_b1 { +- cpu-supply = <&vdd_cpu_b>; + user1-button { + debounce-interval = <100>; + gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_LOW>; @@ -453,114 +355,10 @@ index 9995549873d3..69d76dea35d0 100644 + rockchip,cpu = <&i2s2>; + rockchip,codec = <&cdn_dp>; + }; -+ -+ io_leds: io-gpio-leds { -+ status = "okay"; -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&network_act>, <&usb3_act>, -+ <&sata_act>, <&sata_err_led>; -+ -+ network { -+ label = "helios64:blue:net"; -+ gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "netdev"; -+ default-state = "off"; -+ }; -+ -+ sata { -+ label = "helios64:blue:hdd-status"; -+ gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "disk-activity"; -+ default-state = "off"; -+ }; -+ -+ sata_err1 { -+ label = "helios64:red:ata1-err"; -+ gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_HIGH>; -+ default-state = "keep"; -+ }; -+ -+ sata_err2 { -+ label = "helios64:red:ata2-err"; -+ gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_HIGH>; -+ default-state = "keep"; -+ }; -+ -+ sata_err3 { -+ label = "helios64:red:ata3-err"; -+ gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>; -+ default-state = "keep"; -+ }; -+ -+ sata_err4 { -+ label = "helios64:red:ata4-err"; -+ gpios = <&gpio2 RK_PA5 GPIO_ACTIVE_HIGH>; -+ default-state = "keep"; -+ }; -+ -+ sata_err5 { -+ label = "helios64:red:ata5-err"; -+ gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>; -+ default-state = "keep"; -+ }; -+ -+ usb3 { -+ label = "helios64:blue:usb3"; -+ gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; -+ trigger-sources = <&int_hub_port1>, -+ <&int_hub_port2>, -+ <&int_hub_port3>; -+ linux,default-trigger = "usbport"; -+ default-state = "off"; -+ }; -+ }; -+ -+ pwmleds { -+ compatible = "pwm-leds"; -+ status = "okay"; -+ -+ power-led { -+ label = "helios64:blue:power-status"; -+ pwms = <&pwm3 0 2000000000 0>; -+ max-brightness = <255>; -+ }; -+ }; -+ -+ system_leds: system-gpio-leds { -+ status = "okay"; -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&system_led>; -+ -+ status-led { -+ label = "helios64::status"; -+ gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "none"; -+ default-state = "on"; -+ mode = <0x23>; -+ }; -+ -+ fault-led { -+ label = "helios64:red:fault"; -+ gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "panic"; -+ default-state = "keep"; -+ mode = <0x23>; -+ }; -+ }; - }; - --&cpu_b1 { -- cpu-supply = <&vdd_cpu_b>; -+&cdn_dp { -+ status = "okay"; -+ extcon = <&fusb0>; -+ phys = <&tcphy0_dp>; }; &cpu_l0 { -@@ -278,23 +429,36 @@ &cpu_l3 { +@@ -276,6 +467,20 @@ &cpu_l3 { cpu-supply = <&vdd_cpu_l>; }; @@ -571,61 +369,38 @@ index 9995549873d3..69d76dea35d0 100644 +&cpu_b1 { + cpu-supply = <&vdd_cpu_b>; +}; ++ ++&cdn_dp { ++ status = "okay"; ++ extcon = <&fusb0>; ++ phys = <&tcphy0_dp>; ++}; + &emmc_phy { status = "okay"; }; +@@ -296,6 +500,11 @@ &gmac { + status = "okay"; + }; - &gmac { -- assigned-clock-parents = <&clkin_gmac>; - assigned-clocks = <&cru SCLK_RMII_SRC>; -+ assigned-clock-parents = <&clkin_gmac>; - clock_in_out = "input"; -- phy-mode = "rgmii"; - phy-supply = <&vcc_lan>; -+ phy-mode = "rgmii"; - pinctrl-names = "default"; -- pinctrl-0 = <&rgmii_pins &gphy_reset>; -- rx_delay = <0x20>; -- tx_delay = <0x28>; -+ pinctrl-0 = <&rgmii_pins &rgmii_phy_reset>; -+ snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 10000 50000>; -- snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; -+ tx_delay = <0x28>; -+ rx_delay = <0x20>; ++&gpu { ++ mali-supply = <&vdd_gpu>; + status = "okay"; +}; + -+&gpu { -+ mali-supply = <&vdd_gpu>; - status = "okay"; - }; - -@@ -307,12 +471,15 @@ &i2c0 { - rk808: pmic@1b { - compatible = "rockchip,rk808"; - reg = <0x1b>; -+ #clock-cells = <1>; -+ clock-output-names = "xin32k", "rk808-clkout2"; - interrupt-parent = <&gpio0>; - interrupts = <10 IRQ_TYPE_LEVEL_LOW>; -- clock-output-names = "xin32k", "rk808-clkout2"; + &i2c0 { + clock-frequency = <400000>; + i2c-scl-rising-time-ns = <168>; +@@ -311,6 +520,7 @@ rk808: pmic@1b { pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; rockchip,system-power-controller; -+ wakeup-source; + vcc1-supply = <&vcc5v0_sys>; vcc2-supply = <&vcc5v0_sys>; vcc3-supply = <&vcc5v0_sys>; -@@ -325,10 +492,21 @@ rk808: pmic@1b { - vcc11-supply = <&vcc5v0_sys>; - vcc12-supply = <&vcc3v3_sys_s3>; - vddio-supply = <&vcc3v0_s3>; -- wakeup-source; -- #clock-cells = <1>; +@@ -327,6 +537,19 @@ rk808: pmic@1b { + #clock-cells = <1>; regulators { + vdd_center: DCDC_REG1 { @@ -644,7 +419,7 @@ index 9995549873d3..69d76dea35d0 100644 vdd_cpu_l: DCDC_REG2 { regulator-name = "vdd_cpu_l"; regulator-always-on; -@@ -336,19 +514,48 @@ vdd_cpu_l: DCDC_REG2 { +@@ -334,19 +557,48 @@ vdd_cpu_l: DCDC_REG2 { regulator-min-microvolt = <750000>; regulator-max-microvolt = <1350000>; regulator-ramp-delay = <6001>; @@ -679,12 +454,12 @@ index 9995549873d3..69d76dea35d0 100644 + vcc1v8_dvp: LDO_REG1 { + regulator-name = "vcc1v8_dvp"; + }; -+ + + /* not used */ + vcc3v0_touch: LDO_REG2 { + regulator-name = "vcc3v0_touch"; + }; - ++ + vcc1v8_s3: LDO_REG3 { + regulator-name = "vcc1v8_s3"; + regulator-always-on; @@ -694,7 +469,7 @@ index 9995549873d3..69d76dea35d0 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; -@@ -361,25 +568,61 @@ vcc_sdio_s0: LDO_REG4 { +@@ -359,25 +611,61 @@ vcc_sdio_s0: LDO_REG4 { regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3000000>; @@ -758,7 +533,7 @@ index 9995549873d3..69d76dea35d0 100644 }; }; -@@ -387,12 +630,33 @@ vdd_cpu_b: regulator@40 { +@@ -385,12 +673,33 @@ vdd_cpu_b: regulator@40 { compatible = "silergy,syr827"; reg = <0x40>; fcs,suspend-voltage-selector = <1>; @@ -792,7 +567,7 @@ index 9995549873d3..69d76dea35d0 100644 vin-supply = <&vcc5v0_sys>; regulator-state-mem { -@@ -407,56 +671,222 @@ &i2c2 { +@@ -405,17 +714,101 @@ &i2c2 { i2c-scl-falling-time-ns = <30>; status = "okay"; @@ -816,11 +591,6 @@ index 9995549873d3..69d76dea35d0 100644 }; }; --&io_domains { -- audio-supply = <&vcc1v8_sys_s0>; -- bt656-supply = <&vcc1v8_sys_s0>; -- gpio1830-supply = <&vcc3v0_s3>; -- sdmmc-supply = <&vcc_sdio_s0>; +&i2c4 { + clock-frequency = <400000>; + i2c-scl-rising-time-ns = <160>; @@ -878,10 +648,9 @@ index 9995549873d3..69d76dea35d0 100644 + +/* I2C on UEXT */ +&i2c7 { - status = "okay"; - }; - --&pcie_phy { ++ status = "okay"; ++}; ++ +/* External I2C */ +&i2c8 { + status = "okay"; @@ -889,35 +658,28 @@ index 9995549873d3..69d76dea35d0 100644 + +&i2s2 { + #sound-dai-cells = <0>; - status = "okay"; - }; - -+&io_domains { + status = "okay"; -+ bt656-supply = <&vcc1v8_sys_s0>; -+ audio-supply = <&vcc1v8_sys_s0>; -+ sdmmc-supply = <&vcc_sdio_s0>; -+ gpio1830-supply = <&vcc3v0_s3>; +}; + - &pcie0 { - ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; -- max-link-speed = <2>; + &io_domains { +- audio-supply = <&vcc1v8_sys_s0>; + bt656-supply = <&vcc1v8_sys_s0>; +- gpio1830-supply = <&vcc3v0_s3>; ++ audio-supply = <&vcc1v8_sys_s0>; + sdmmc-supply = <&vcc_sdio_s0>; ++ gpio1830-supply = <&vcc3v0_s3>; + status = "okay"; + }; + +@@ -428,6 +821,7 @@ &pcie0 { + max-link-speed = <2>; num-lanes = <2>; -+ max-link-speed = <2>; pinctrl-names = "default"; -- status = "okay"; -- + pinctrl-0 = <&pcie_prst &pcie_clkreqn_cpm>; + status = "okay"; + vpcie12v-supply = <&vcc12v_dcin>; - vpcie3v3-supply = <&pcie_power>; - vpcie1v8-supply = <&avdd_1v8_s0>; - vpcie0v9-supply = <&avdd_0v9_s0>; -+ status = "okay"; -+}; -+ -+&pcie_phy { -+ status = "okay"; +@@ -437,36 +831,116 @@ &pcie0 { }; &pinctrl { @@ -953,20 +715,17 @@ index 9995549873d3..69d76dea35d0 100644 + + fusb30x { + fusb0_int: fusb0-int { -+ rockchip,pins = -+ <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; ++ rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + fusb0_vbus_en: fusb0-vbus-en { -+ rockchip,pins = -+ <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; ++ rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + gmac { -- gphy_reset: gphy-reset { + gphy_reset: gphy-reset { - rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_output_low>; -+ rgmii_phy_reset: rgmii-phy-reset { + rockchip,pins = + <3 RK_PB7 RK_FUNC_GPIO &pcfg_output_low>; }; @@ -976,133 +735,88 @@ index 9995549873d3..69d76dea35d0 100644 - sys_grn_led_on: sys-grn-led-on { - rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; + network_act: network-act { -+ rockchip,pins = -+ <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>; ++ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + usb3_act: usb3-act { -+ rockchip,pins = -+ <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_down>; ++ rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + sata_act: sata-act { -+ rockchip,pins = -+ <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>; ++ rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + system_led: sys-led { -+ rockchip,pins = -+ <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>, -+ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>; ++ rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>, ++ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + sata_err_led: sata-err-led { -+ rockchip,pins = -+ <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_down>, -+ <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_down>, -+ <2 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>, -+ <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>, -+ <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_down>; ++ rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_down>, ++ <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_down>, ++ <2 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>, ++ <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>, ++ <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + + misc { + pca0_pins: pca0-pins { -+ rockchip,pins = -+ <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; ++ rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; }; - sys_red_led_on: sys-red-led-on { - rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>; + wake_on_lan: wake-on-lan { -+ rockchip,pins = -+ <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; ++ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; pcie { - pcie_pwr: pcie-pwr { -+ pcie_prst: pcie-prst { -+ rockchip,pins = -+ <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ + pcie_pwr_en: pcie-pwr-en { rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; }; -@@ -464,31 +894,45 @@ pcie_pwr: pcie-pwr { ++ ++ pcie_prst: pcie-prst { ++ rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; + }; pmic { pmic_int_l: pmic-int-l { - rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; -+ rockchip,pins = -+ <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; ++ rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + vsel1_gpio: vsel1-gpio { -+ rockchip,pins = -+ <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; ++ rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + vsel2_gpio: vsel2-gpio { -+ rockchip,pins = -+ <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; ++ rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; }; }; - power { -- hdd_a_power_en: hdd-a-power-en { -- rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; + power { -+ hdd_a_power: hdd-a-power { -+ rockchip,pins = -+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - -- hdd_b_power_en: hdd-b-power-en { -- rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; -+ hdd_b_power: hdd-b-power { -+ rockchip,pins = -+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - vcc5v0_usb_en: vcc5v0-usb-en { -- rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; -+ rockchip,pins = -+ <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - -- usb_lan_en: usb-lan-en { -- rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; -+ sdmmc0_pwr_h: sdmmc0-pwr-h { -+ rockchip,pins = -+ <0 RK_PA1 RK_FUNC_GPIO &pcfg_output_high>; + hdd_a_power_en: hdd-a-power-en { + rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; -- }; +@@ -486,7 +960,7 @@ usb_lan_en: usb-lan-en { -- vcc3v0-sd { -- sdmmc0_pwr_h: sdmmc0-pwr-h { + vcc3v0-sd { + sdmmc0_pwr_h: sdmmc0-pwr-h { - rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>; -+ usb_lan_en: usb-lan-en { -+ rockchip,pins = -+ <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; ++ rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_output_high>; }; }; }; -@@ -499,28 +943,46 @@ &pmu_io_domains { - }; - - &pwm0 { -- /* pwm-fan on P7 */ +@@ -506,10 +980,29 @@ &pwm1 { status = "okay"; }; - &pwm1 { -- /* pwm-fan on P6 */ -+ status = "okay"; -+}; -+ +&pwm2 { + status = "okay"; +}; @@ -1113,9 +827,9 @@ index 9995549873d3..69d76dea35d0 100644 + +&saradc { + vref-supply = <&vcc1v8_s3>; - status = "okay"; - }; - ++ status = "okay"; ++}; ++ &sdhci { + assigned-clock-rates = <150000000>; bus-width = <8>; @@ -1125,12 +839,11 @@ index 9995549873d3..69d76dea35d0 100644 + // mmc-hs400-enhanced-strobe; + supports-emmc; non-removable; -- vqmmc-supply = <&vcc1v8_sys_s0>; + disable-wp; + vqmmc-supply = <&vcc1v8_sys_s0>; status = "okay"; -+ vqmmc-supply = <&vcc1v8_sys_s0>; }; - +@@ -517,8 +1010,9 @@ &sdhci { &sdmmc { bus-width = <4>; cap-sd-highspeed; @@ -1141,22 +854,7 @@ index 9995549873d3..69d76dea35d0 100644 pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; vmmc-supply = <&vcc3v0_sd>; -@@ -530,14 +992,6 @@ &sdmmc { - - &spi1 { - status = "okay"; -- -- spiflash: flash@0 { -- compatible = "jedec,spi-nor"; -- reg = <0x0>; -- spi-max-frequency = <25000000>; -- status = "okay"; -- m25p,fast-read; -- }; - }; - - /* UEXT connector */ -@@ -549,8 +1003,28 @@ &spi5 { +@@ -547,6 +1041,27 @@ &spi5 { status = "okay"; }; @@ -1182,11 +880,9 @@ index 9995549873d3..69d76dea35d0 100644 +}; + &tcphy1 { -- /* phy for &usbdrd_dwc3_1 */ + /* phy for &usbdrd_dwc3_1 */ status = "okay"; - }; - -@@ -562,61 +1036,119 @@ &tsadc { +@@ -560,61 +1075,118 @@ &tsadc { status = "okay"; }; @@ -1255,8 +951,8 @@ index 9995549873d3..69d76dea35d0 100644 - dr_mode = "host"; - status = "okay"; +&usbdrd_dwc3_1 { -+ status = "okay"; + dr_mode = "host"; ++ status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; @@ -1273,15 +969,11 @@ index 9995549873d3..69d76dea35d0 100644 reg = <1>; - #address-cells = <1>; - #size-cells = <0>; -+ #trigger-source-cells = <0>; -+ }; - +- - port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; -+ int_hub_port2: port@2 { -+ reg = <2>; + #trigger-source-cells = <0>; + }; @@ -1289,8 +981,8 @@ index 9995549873d3..69d76dea35d0 100644 - reg = <2>; - #trigger-source-cells = <0>; - }; -+ int_hub_port3: port@3 { -+ reg = <3>; ++ int_hub_port2: port@2 { ++ reg = <2>; + #trigger-source-cells = <0>; + }; @@ -1298,24 +990,28 @@ index 9995549873d3..69d76dea35d0 100644 - reg = <3>; - #trigger-source-cells = <0>; - }; -+ usb_lan: device@4 { -+ compatible = "usbbda,8156"; -+ reg = <4>; ++ int_hub_port3: port@3 { ++ reg = <3>; ++ #trigger-source-cells = <0>; ++ }; - device@4 { - compatible = "usbbda,8156"; - reg = <4>; - #address-cells = <2>; - #size-cells = <0>; ++ usb_lan: device@4 { ++ compatible = "usbbda,8156"; ++ reg = <4>; + #address-cells = <2>; + #size-cells = <0>; - interface@0 { /* interface 0 of configuration 1 */ -- compatible = "usbbda,8156.config1.0"; +- compatible = "usbifbda,8156.config1.0"; - reg = <0 1>; - }; + interface@0 { /* interface 0 of configuration 1 */ -+ compatible = "usbbda,8156.config1.0"; ++ compatible = "usbifbda,8156.config1.0"; + reg = <0 1>; }; }; @@ -1337,6 +1033,6 @@ index 9995549873d3..69d76dea35d0 100644 +&vopl_mmu { + status = "okay"; +}; -\ No newline at end of file -- -Armbian +2.43.0 + diff --git a/patch/kernel/archive/rockchip64-6.9/board-helios64-dts-fix-stability-issues.patch.disabled b/patch/kernel/archive/rockchip64-6.9/board-helios64-dts-fix-stability-issues.patch similarity index 94% rename from patch/kernel/archive/rockchip64-6.9/board-helios64-dts-fix-stability-issues.patch.disabled rename to patch/kernel/archive/rockchip64-6.9/board-helios64-dts-fix-stability-issues.patch index 4c53e0fe813c..1b427c141177 100644 --- a/patch/kernel/archive/rockchip64-6.9/board-helios64-dts-fix-stability-issues.patch.disabled +++ b/patch/kernel/archive/rockchip64-6.9/board-helios64-dts-fix-stability-issues.patch @@ -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 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 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(+) 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 +++ 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-0 = <&pmic_int_l>; rockchip,system-power-controller; + max-buck-steps-per-change = <4>; - wakeup-source; vcc1-supply = <&vcc5v0_sys>; + vcc2-supply = <&vcc5v0_sys>; -- -Armbian +2.43.0 diff --git a/patch/kernel/archive/rockchip64-6.9/board-helios64-remove-overclock.patch.disabled b/patch/kernel/archive/rockchip64-6.9/board-helios64-remove-overclock.patch.disabled deleted file mode 100644 index 20ac4c33a314..000000000000 --- a/patch/kernel/archive/rockchip64-6.9/board-helios64-remove-overclock.patch.disabled +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aditya Prayoga -Date: Mon, 7 Sep 2020 20:29:43 +0700 -Subject: Remove overclock from helios64 - -Signed-off-by: Aditya Prayoga ---- - 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 - diff --git a/patch/kernel/archive/rockchip64-6.9/board-helios64-remove-pcie-ep-gpios.patch.disabled b/patch/kernel/archive/rockchip64-6.9/board-helios64-remove-pcie-ep-gpios.patch similarity index 76% rename from patch/kernel/archive/rockchip64-6.9/board-helios64-remove-pcie-ep-gpios.patch.disabled rename to patch/kernel/archive/rockchip64-6.9/board-helios64-remove-pcie-ep-gpios.patch index 3b4d31a5df1d..ff7ca38b5346 100644 --- a/patch/kernel/archive/rockchip64-6.9/board-helios64-remove-pcie-ep-gpios.patch.disabled +++ b/patch/kernel/archive/rockchip64-6.9/board-helios64-remove-pcie-ep-gpios.patch @@ -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 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 --- @@ -9,17 +9,17 @@ Signed-off-by: Aditya Prayoga 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 -index e1994a72e308..f4c50e5ce896 100644 +index 4cb72981809a..824e7a4d8e40 100644 --- a/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 { - ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; - num-lanes = <2>; max-link-speed = <2>; + num-lanes = <2>; pinctrl-names = "default"; -- -Armbian +2.43.0