From: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Date: Tue, 19 May 2015 06:07:55 +0000 (+0900)
Subject: ARM: multi_v7_defconfig: Enable TMU for exynos SoCs
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a5112b6bfc1ac3e70da21599225d2bfe611dd34d;p=linux-beck.git

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 <k.kozlowski.k@gmail.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

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