diff options
author | Riku Voipio <riku.voipio@linaro.org> | 2014-05-31 07:50:26 -0400 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-07-15 10:25:11 -0400 |
commit | b3dee3905c19d4897386ee0282004b9723a7b6c9 (patch) | |
tree | 4e0b44bdf08808bd9fb4241b19d214a53f1915a8 | |
parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) |
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 <riku.voipio@linaro.org>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
-rw-r--r-- | drivers/thermal/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
151 | 151 | ||
152 | config DOVE_THERMAL | 152 | config DOVE_THERMAL |
153 | tristate "Temperature sensor on Marvell Dove SoCs" | 153 | tristate "Temperature sensor on Marvell Dove SoCs" |
154 | depends on ARCH_DOVE | 154 | depends on ARCH_DOVE || MACH_DOVE |
155 | depends on OF | 155 | depends on OF |
156 | help | 156 | help |
157 | Support for the Dove thermal sensor driver in the Linux thermal | 157 | Support for the Dove thermal sensor driver in the Linux thermal |