summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski.k@gmail.com>2015-05-19 15:07:55 +0900
committerArnd Bergmann <arnd@arndb.de>2015-05-22 17:14:07 +0200
commita5112b6bfc1ac3e70da21599225d2bfe611dd34d (patch)
tree563d301acfa8887bb309d2e864ddb43dc5083ce7 /arch/arm/configs
parentdcf9a03bff4ee5ad5795d1f233c6880f49d298c2 (diff)
downloadblackbird-op-linux-a5112b6bfc1ac3e70da21599225d2bfe611dd34d.tar.gz
blackbird-op-linux-a5112b6bfc1ac3e70da21599225d2bfe611dd34d.zip
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>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/multi_v7_defconfig3
1 files changed, 2 insertions, 1 deletions
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
OpenPOWER on IntegriCloud