From a5112b6bfc1ac3e70da21599225d2bfe611dd34d Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Tue, 19 May 2015 15:07:55 +0900 Subject: [PATCH] ARM: multi_v7_defconfig: Enable TMU for exynos SoCs Enable support for Thermal Monitoring Unit present on Exynos SoCs. This allows detection of overheat and handling this gracefully. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Javier Martinez Canillas Signed-off-by: Kukjin Kim Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index d1fa22452293..be24ac2fba54 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -358,7 +358,8 @@ CONFIG_THERMAL=y CONFIG_CPU_THERMAL=y CONFIG_RCAR_THERMAL=y CONFIG_ARMADA_THERMAL=y -CONFIG_DAVINCI_WATCHDOG +CONFIG_DAVINCI_WATCHDOG=m +CONFIG_EXYNOS_THERMAL=m CONFIG_ST_THERMAL_SYSCFG=y CONFIG_ST_THERMAL_MEMMAP=y CONFIG_WATCHDOG=y -- 2.39.5