diff --git a/config/boards/bananapim2plus.conf b/config/boards/bananapim2plus.conf index bf2a9eac5b..40171e11f7 100644 --- a/config/boards/bananapim2plus.conf +++ b/config/boards/bananapim2plus.conf @@ -5,8 +5,6 @@ BOOTCONFIG="Sinovoip_BPI_M2_Plus_defconfig" # MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir dhd hci_uart rfcomm hidp" MODULES_NEXT="brcmfmac g_serial" -CPUMIN="240000" -CPUMAX="1200000" # KERNEL_TARGET="default,next,dev" CLI_TARGET="stretch,bionic:next" diff --git a/config/boards/beelinkx2.tvb b/config/boards/beelinkx2.tvb index c3f44f6dd2..f48adcd8b7 100644 --- a/config/boards/beelinkx2.tvb +++ b/config/boards/beelinkx2.tvb @@ -5,8 +5,6 @@ BOOTCONFIG="beelink_x2_defconfig" # MODULES="sndspdif sunxi_sndspdif sunxi_spdif sunxi_spdma sunxi-cir" MODULES_NEXT="" -CPUMIN="240000" -CPUMAX="1200000" # KERNEL_TARGET="default,next,dev" CLI_TARGET="stretch,bionic:next" diff --git a/config/boards/nanopiair.conf b/config/boards/nanopiair.conf index f343aa69f0..e36fd7771c 100644 --- a/config/boards/nanopiair.conf +++ b/config/boards/nanopiair.conf @@ -7,8 +7,6 @@ MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_seri MODULES_NEXT="brcmfmac g_serial" DEFAULT_OVERLAYS="usbhost1 usbhost2" DEFAULT_CONSOLE="serial" -CPUMIN="240000" -CPUMAX="912000" # BUILD_DESKTOP="no" # diff --git a/config/boards/nanopiduo.conf b/config/boards/nanopiduo.conf index f3c016673f..f84feabbcd 100644 --- a/config/boards/nanopiduo.conf +++ b/config/boards/nanopiduo.conf @@ -7,8 +7,6 @@ MODULES_NEXT="g_serial" MODULES_BLACKLIST="dhd" DEFAULT_OVERLAYS="usbhost2 usbhost3" DEFAULT_CONSOLE="serial" -CPUMIN=240000 -CPUMAX=1200000 BUILD_DESKTOP="no" # KERNEL_TARGET="default,next,dev" diff --git a/config/boards/nanopim1.eos b/config/boards/nanopim1.eos index 3071601b27..b41df29f19 100644 --- a/config/boards/nanopim1.eos +++ b/config/boards/nanopim1.eos @@ -5,8 +5,6 @@ BOOTCONFIG="nanopi_m1_defconfig" # MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir" MODULES_NEXT="" -CPUMIN="240000" -CPUMAX="1200000" # KERNEL_TARGET="default,next,dev" CLI_TARGET="stretch,bionic:next" diff --git a/config/boards/nanopim1plus.eos b/config/boards/nanopim1plus.eos index 23767ee963..cf1f91648a 100644 --- a/config/boards/nanopim1plus.eos +++ b/config/boards/nanopim1plus.eos @@ -5,8 +5,6 @@ BOOTCONFIG="nanopi_m1_plus_defconfig" # MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd" MODULES_NEXT="brcmfmac" -CPUMIN="240000" -CPUMAX="1200000" # KERNEL_TARGET="default,next,dev" CLI_TARGET="stretch,bionic:next" diff --git a/config/boards/nanopineo.conf b/config/boards/nanopineo.conf index 098cbb8ad4..f162f413f6 100644 --- a/config/boards/nanopineo.conf +++ b/config/boards/nanopineo.conf @@ -7,8 +7,6 @@ MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir g_serial" MODULES_NEXT="g_serial" DEFAULT_OVERLAYS="usbhost1 usbhost2" DEFAULT_CONSOLE="serial" -CPUMIN="240000" -CPUMAX="912000" # BUILD_DESKTOP="no" # diff --git a/config/boards/orangepi-r1.conf b/config/boards/orangepi-r1.conf index 518d5f1692..a4551dc93f 100644 --- a/config/boards/orangepi-r1.conf +++ b/config/boards/orangepi-r1.conf @@ -7,8 +7,6 @@ MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir g_serial r8152 8189es" MODULES_NEXT="g_serial r8152 8189es" MODULES_BLACKLIST="dhd" DEFAULT_OVERLAYS="usbhost2 usbhost3" -CPUMIN=240000 -CPUMAX=1200000 BUILD_DESKTOP="no" # KERNEL_TARGET="default,next,dev" diff --git a/config/boards/orangepizero.conf b/config/boards/orangepizero.conf index 90e2c32997..7d54c6d619 100644 --- a/config/boards/orangepizero.conf +++ b/config/boards/orangepizero.conf @@ -8,8 +8,6 @@ MODULES_NEXT="g_serial" MODULES_BLACKLIST="dhd" DEFAULT_OVERLAYS="usbhost2 usbhost3" DEFAULT_CONSOLE="serial" -CPUMIN=240000 -CPUMAX=1200000 BUILD_DESKTOP="no" # KERNEL_TARGET="default,next,dev" diff --git a/config/boards/orangepizeroplus.conf b/config/boards/orangepizeroplus.conf index 2d9132745d..eb929d4b20 100644 --- a/config/boards/orangepizeroplus.conf +++ b/config/boards/orangepizeroplus.conf @@ -6,8 +6,6 @@ MODULES="" MODULES_NEXT="8189fs g_serial" DEFAULT_CONSOLE="serial" DEFAULT_OVERLAYS="usbhost2 usbhost3" -CPUMIN="120000" -CPUMAX="1200000" # BUILD_DESKTOP="no" # diff --git a/config/boards/orangepizeroplus2-h3.conf b/config/boards/orangepizeroplus2-h3.conf index 15008f0cc1..d7e91e2873 100644 --- a/config/boards/orangepizeroplus2-h3.conf +++ b/config/boards/orangepizeroplus2-h3.conf @@ -7,8 +7,6 @@ MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_seri MODULES_NEXT="brcmfmac g_serial" MODULES_BLACKLIST="" DEFAULT_OVERLAYS="usbhost2 usbhost3" -CPUMIN=240000 -CPUMAX=1200000 # KERNEL_TARGET="default,next,dev" CLI_TARGET="stretch,bionic:next" diff --git a/config/boards/orangepizeroplus2-h5.conf b/config/boards/orangepizeroplus2-h5.conf index be607a3e48..1c4edcb504 100644 --- a/config/boards/orangepizeroplus2-h5.conf +++ b/config/boards/orangepizeroplus2-h5.conf @@ -7,8 +7,6 @@ MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_seri MODULES_NEXT="brcmfmac g_serial" MODULES_BLACKLIST="" DEFAULT_OVERLAYS="usbhost2 usbhost3" -CPUMIN=240000 -CPUMAX=1200000 BUILD_DESKTOP="no" # KERNEL_TARGET="next,dev" diff --git a/config/boards/sunvell-r69.csc b/config/boards/sunvell-r69.csc index eacd33581f..53b3fe5077 100644 --- a/config/boards/sunvell-r69.csc +++ b/config/boards/sunvell-r69.csc @@ -7,8 +7,6 @@ MODULES="xradio_wlan xradio_wlan" MODULES_NEXT="" MODULES_BLACKLIST="dhd" DEFAULT_OVERLAYS="cir analog-codec" -CPUMIN=240000 -CPUMAX=1008000 # KERNEL_TARGET="default,next,dev" CLI_TARGET="stretch,xenial:next" diff --git a/config/boards/tritium-h3.csc b/config/boards/tritium-h3.csc index 19f9bb151c..488dcf87fe 100644 --- a/config/boards/tritium-h3.csc +++ b/config/boards/tritium-h3.csc @@ -6,8 +6,6 @@ BOOTCONFIG="libretech_all_h3_cc_h3_defconfig" MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_serial" MODULES_NEXT="g_serial" DEFAULT_OVERLAYS="usbhost1 usbhost2 analog-codec" -CPUMIN="240000" -CPUMAX="1008000" # KERNEL_TARGET="next,dev" CLI_TARGET="stretch,bionic:next" diff --git a/config/boards/tritium-h5.csc b/config/boards/tritium-h5.csc index 8376b01b20..728bcd008a 100644 --- a/config/boards/tritium-h5.csc +++ b/config/boards/tritium-h5.csc @@ -6,8 +6,6 @@ BOOTCONFIG="libretech_all_h3_cc_h5_defconfig" MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd" MODULES_NEXT="" DEFAULT_OVERLAYS="analog-codec" -CPUMIN="240000" -CPUMAX="1200000" # KERNEL_TARGET="next,dev" CLI_TARGET="stretch,bionic:next" diff --git a/patch/kernel/sunxi-next/ths-29-sun4i-gpadc-iio-add-h5-thermal-zone.patch b/patch/kernel/sunxi-next/ths-29-add-correct-h5-thermal-zone.patch similarity index 60% rename from patch/kernel/sunxi-next/ths-29-sun4i-gpadc-iio-add-h5-thermal-zone.patch rename to patch/kernel/sunxi-next/ths-29-add-correct-h5-thermal-zone.patch index a167a5e57b..9ce9bffd48 100644 --- a/patch/kernel/sunxi-next/ths-29-sun4i-gpadc-iio-add-h5-thermal-zone.patch +++ b/patch/kernel/sunxi-next/ths-29-add-correct-h5-thermal-zone.patch @@ -1,32 +1,29 @@ -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi -index 55b95569..422589b3 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi -@@ -41,6 +41,7 @@ - */ - - #include -+#include - - / { - cpus { -@@ -98,6 +99,80 @@ - method = "smc"; +diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +index d1890797c..6cb02c962 100644 +--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi ++++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +@@ -1045,28 +1045,74 @@ }; -+ thermal-zones { + thermal-zones { +- cpu_thermal: cpu_thermal { +- polling-delay-passive = <330>; + cpu-thermal { + /* milliseconds */ + polling-delay-passive = <250>; -+ polling-delay = <1000>; + polling-delay = <1000>; +- thermal-sensors = <&ths 0>; + thermal-sensors = <&ths>; -+ -+ trips { + + trips { +- cpu_hot_trip: cpu-warm { +- temperature = <65000>; + cpu_warm: cpu_warm { + temperature = <75000>; -+ hysteresis = <2000>; -+ type = "passive"; -+ }; + hysteresis = <2000>; + type = "passive"; + }; +- cpu_very_hot_trip: cpu-very-hot { + + cpu_hot_pre: cpu_hot_pre { + temperature = <80000>; @@ -41,8 +38,8 @@ index 55b95569..422589b3 100644 + }; + + cpu_very_hot_pre: cpu_very_hot_pre { -+ temperature = <90000>; -+ hysteresis = <2000>; + temperature = <90000>; + hysteresis = <2000>; + type = "passive"; + }; + @@ -55,11 +52,14 @@ index 55b95569..422589b3 100644 + cpu_crit: cpu_crit { + temperature = <105000>; + hysteresis = <2000>; -+ type = "critical"; -+ }; -+ }; -+ -+ cooling-maps { + type = "critical"; + }; + }; + + cooling-maps { +- cpu-warm-limit { +- trip = <&cpu_hot_trip>; +- cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + cpu_warm_limit_cpu { + trip = <&cpu_warm>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT 2>; @@ -83,11 +83,6 @@ index 55b95569..422589b3 100644 + cpu_very_hot_limit_cpu { + trip = <&cpu_very_hot>; + cooling-device = <&cpu0 7 THERMAL_NO_LIMIT>; -+ }; -+ }; -+ }; -+ }; -+ - timer { - compatible = "arm,armv8-timer"; - interrupts =