diff options
author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-04-01 17:12:29 +0300 |
---|---|---|
committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-04-01 19:11:26 +0300 |
commit | a0e2111014c66e01ccf439b1d507e0ab3fecc818 (patch) | |
tree | 830862bb79c19f2f88be8338483f22f1a47101b5 | |
parent | 851df52aa724109c1e664fc5c59610625bc83728 (diff) |
ARM: config: toradex: set delay for thermal emergency poweroff
If the delay is not set, the thermal emergency poweroff function
disabled. It leads to unable powering down the system in case of
critical temperature is reached and system tool /sbin/poweroff
is unavailable or fail.
Set the option CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS to
10 seconds. Usually it's enough to shutting system down with
/sbin/poweroff.
The forceful kernel-side emergency poweroff procedure performs only
if the system tool fails to power down the system within 10 seconds.
Related-to: ELB-3852
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
-rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/configs/colibri-imx6ull_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/configs/colibri_imx6_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/configs/colibri_imx7_defconfig | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index 49b001b0953b..ef7f04a1482b 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -110,7 +110,6 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m -# CONFIG_BT_HS is not set # CONFIG_BT_LE is not set CONFIG_BT_LEDS=y CONFIG_BT_HCIBTUSB=m @@ -275,6 +274,8 @@ CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_HWMON is not set CONFIG_SENSORS_MAG3110=y CONFIG_THERMAL=y +CONFIG_THERMAL_STATISTICS=y +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=10000 CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y CONFIG_DEVICE_THERMAL=y diff --git a/arch/arm/configs/colibri-imx6ull_defconfig b/arch/arm/configs/colibri-imx6ull_defconfig index 15b84356953e..fa44401c12b3 100644 --- a/arch/arm/configs/colibri-imx6ull_defconfig +++ b/arch/arm/configs/colibri-imx6ull_defconfig @@ -111,7 +111,6 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m -# CONFIG_BT_HS is not set # CONFIG_BT_LE is not set CONFIG_BT_LEDS=y CONFIG_BT_HCIBTUSB=m @@ -270,6 +269,8 @@ CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_HWMON is not set # CONFIG_MXC_MMA8451 is not set CONFIG_THERMAL=y +CONFIG_THERMAL_STATISTICS=y +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=10000 CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y CONFIG_DEVICE_THERMAL=y diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig index ad273b2a077f..c43a5db06d34 100644 --- a/arch/arm/configs/colibri_imx6_defconfig +++ b/arch/arm/configs/colibri_imx6_defconfig @@ -109,7 +109,6 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m -# CONFIG_BT_HS is not set # CONFIG_BT_LE is not set CONFIG_BT_LEDS=y CONFIG_BT_HCIBTUSB=m @@ -269,6 +268,8 @@ CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_HWMON is not set CONFIG_SENSORS_MAG3110=y CONFIG_THERMAL=y +CONFIG_THERMAL_STATISTICS=y +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=10000 CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y CONFIG_DEVICE_THERMAL=y diff --git a/arch/arm/configs/colibri_imx7_defconfig b/arch/arm/configs/colibri_imx7_defconfig index 1e64b2e4345f..8d637592b649 100644 --- a/arch/arm/configs/colibri_imx7_defconfig +++ b/arch/arm/configs/colibri_imx7_defconfig @@ -46,6 +46,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPUFREQ_DT=y +CONFIG_ARM_IMX_CPUFREQ_DT=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y CONFIG_ARM_PSCI_CPUIDLE=y @@ -108,7 +109,6 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m -# CONFIG_BT_HS is not set # CONFIG_BT_LE is not set CONFIG_BT_LEDS=y CONFIG_BT_HCIBTUSB=m @@ -266,8 +266,9 @@ CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_HWMON is not set # CONFIG_MXC_MMA8451 is not set CONFIG_THERMAL=y +CONFIG_THERMAL_STATISTICS=y +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=10000 CONFIG_CPU_THERMAL=y -CONFIG_ARM_IMX_CPUFREQ_DT=y CONFIG_IMX_THERMAL=y CONFIG_DEVICE_THERMAL=y CONFIG_WATCHDOG=y |