5 files changed, 19 insertions, 9 deletions

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index e988c81d763c..34fa688053d4 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -114,14 +114,6 @@ config KIRKWOOD_THERMAL
           Support for the Kirkwood thermal sensor driver into the Linux thermal
           framework. Only kirkwood 88F6282 and 88F6283 have this sensor.
 
-config EXYNOS_THERMAL
-        tristate "Temperature sensor on Samsung EXYNOS"
-        depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5)
-        depends on CPU_THERMAL
-        help
-          If you say yes here you get support for TMU (Thermal Management
-          Unit) on SAMSUNG EXYNOS series of SoC.
-
 config DOVE_THERMAL
         tristate "Temperature sensor on Marvell Dove SoCs"
         depends on ARCH_DOVE
@@ -184,4 +176,9 @@ menu "Texas Instruments thermal drivers"
 source "drivers/thermal/ti-soc-thermal/Kconfig"
 endmenu
 
+menu "Samsung thermal drivers"
+depends on PLAT_SAMSUNG
+source "drivers/thermal/samsung/Kconfig"
+endmenu
+
 endif
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 67184a293e3f..1f27ada36a65 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -17,7 +17,7 @@ thermal_sys-$(CONFIG_CPU_THERMAL)	+= cpu_cooling.o
 obj-$(CONFIG_SPEAR_THERMAL)     += spear_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)      += rcar_thermal.o
 obj-$(CONFIG_KIRKWOOD_THERMAL)  += kirkwood_thermal.o
-obj-$(CONFIG_EXYNOS_THERMAL)    += exynos_thermal.o
+obj-y                           += samsung/
 obj-$(CONFIG_DOVE_THERMAL)      += dove_thermal.o
 obj-$(CONFIG_DB8500_THERMAL)    += db8500_thermal.o
 obj-$(CONFIG_ARMADA_THERMAL)    += armada_thermal.o
diff --git a/drivers/thermal/samsung/Kconfig b/drivers/thermal/samsung/Kconfig
new file mode 100644
index 000000000000..2d3d9dcf9e31
--- /dev/null
+++ b/drivers/thermal/samsung/Kconfig
@@ -0,0 +1,9 @@
+config EXYNOS_THERMAL
+        tristate "Temperature sensor on Samsung EXYNOS"
+        depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5)
+        depends on CPU_THERMAL
+        help
+          If you say yes here you get support for TMU (Thermal Management
+          Unit) on SAMSUNG EXYNOS series of SoC. This helps in registering
+          the exynos thermal driver with the core thermal layer and cpu
+          cooling API's.
diff --git a/drivers/thermal/samsung/Makefile b/drivers/thermal/samsung/Makefile
new file mode 100644
index 000000000000..1fe6d939e8f1
--- /dev/null
+++ b/drivers/thermal/samsung/Makefile
@@ -0,0 +1,4 @@
+#
+# Samsung thermal specific Makefile
+#
+obj-$(CONFIG_EXYNOS_THERMAL)    += exynos_thermal.o
diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/samsung/exynos_thermal.c
index 9af4b93c9f86..9af4b93c9f86 100644
--- a/drivers/thermal/exynos_thermal.c
+++ b/drivers/thermal/samsung/exynos_thermal.c