From 60aef7ce455653f9cc57337fac807e80c65f75cb Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 5 Jun 2014 16:06:55 +0100 Subject: thermal: sti: Introduce ST Thermal core code This core is shared by both ST's 'memory mapped' and 'system configuration register' based Thermal controllers. Signed-off-by: Ajit Pal Singh Signed-off-by: Lee Jones Acked-by: Pavel Machek Signed-off-by: Zhang Rui --- drivers/thermal/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers/thermal/Kconfig') diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index f9a13867cb70..57240f5f3d59 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -243,4 +243,9 @@ depends on ARCH_EXYNOS source "drivers/thermal/samsung/Kconfig" endmenu +menu "STMicroelectronics thermal drivers" +depends on ARCH_STI && OF +source "drivers/thermal/st/Kconfig" +endmenu + endif -- cgit v1.2.3-55-g7522 From b3dee3905c19d4897386ee0282004b9723a7b6c9 Mon Sep 17 00:00:00 2001 From: Riku Voipio Date: Sat, 31 May 2014 14:50:26 +0300 Subject: thermal: allow building dove_thermal with mvebu DT-enabled Dove has moved from ARCH_DOVE in mach-dove to MACH_DOVE in mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new DT-only MACH_DOVE to thermal Kconfig. This was originally supposed to go in via "ARM: dove: prepare new Dove DT Kconfig" patch from Sebastian Hesselbarth for 3.15, but slipped through the cracks. I've tested on CuBox that without this patch you can't compile dove_thermal into a mach-mvebu based kernel, and with this patch I can build the driver and it works as expected run-time. v2: non-ascii char creeped in somehow Signed-off-by: Riku Voipio Cc: Sebastian Hesselbarth Cc: Zhang Rui Cc: Eduardo Valentin Cc: linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Acked-by: Sebastian Hesselbarth Signed-off-by: Zhang Rui --- drivers/thermal/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/thermal/Kconfig') diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index f9a13867cb70..589ac1ab5605 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL config DOVE_THERMAL tristate "Temperature sensor on Marvell Dove SoCs" - depends on ARCH_DOVE + depends on ARCH_DOVE || MACH_DOVE depends on OF help Support for the Dove thermal sensor driver in the Linux thermal -- cgit v1.2.3-55-g7522