drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir

This cleans up the directory a bit allowing just one place to look for
thermal related drivers for QCOM platforms instead of being scattered in
the root directory and the qcom/ subdirectory. Compile-tested with
ARCH=arm64 defconfig and the driver explicitly enabled with menuconfig.

Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 772ab9dadda7eedea49e873a05a6a714e4651e29..344f6459862be687e32e8c5f254fd6b78fc32968 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -374,17 +374,6 @@ config TANGO_THERMAL
 
 source "drivers/thermal/tegra/Kconfig"
 
-config QCOM_SPMI_TEMP_ALARM
-       tristate "Qualcomm SPMI PMIC Temperature Alarm"
-       depends on OF && SPMI && IIO
-       select REGMAP_SPMI
-       help
-         This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP)
-         PMIC devices. It shows up in sysfs as a thermal sensor with multiple
-         trip points. The temperature reported by the thermal sensor reflects the
-         real time die temperature if an ADC is present or an estimate of the
-         temperature based upon the over temperature stage value.
-
 config GENERIC_ADC_THERMAL
        tristate "Generic ADC based thermal sensor"
        depends on IIO

diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 0b5d33a49b3e38ce052d9411de79e8dbaa4f21a3..486d682be0477e3052600c958de837302f243421 100644 (file)
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -29,7 +29,6 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 
 # platform thermal drivers
 obj-y                          += broadcom/
-obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM)     += qcom-spmi-temp-alarm.o
 obj-$(CONFIG_SPEAR_THERMAL)    += spear_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL) += rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)     += rcar_thermal.o

diff --git a/drivers/thermal/qcom/Kconfig b/drivers/thermal/qcom/Kconfig
index be32e5abce3cb134683c19432e37cc372adb9f6b..cdb455ffd5752ef1e7c9094ebf5205ee97bf4403 100644 (file)
--- a/drivers/thermal/qcom/Kconfig
+++ b/drivers/thermal/qcom/Kconfig
@@ -9,3 +9,14 @@ config QCOM_TSENS
          thermal zone device via the mode file results in disabling the sensor.
          Also able to set threshold temperature for both hot and cold and update
          when a threshold is reached.
+
+config QCOM_SPMI_TEMP_ALARM
+       tristate "Qualcomm SPMI PMIC Temperature Alarm"
+       depends on OF && SPMI && IIO
+       select REGMAP_SPMI
+       help
+         This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP)
+         PMIC devices. It shows up in sysfs as a thermal sensor with multiple
+         trip points. The temperature reported by the thermal sensor reflects the
+         real time die temperature if an ADC is present or an estimate of the
+         temperature based upon the over temperature stage value.

diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
index a821929ede0bd014c42437dd964605e06746fdf2..717a08600bb5662c983bb9cc5761c3ad148b82c0 100644 (file)
--- a/drivers/thermal/qcom/Makefile
+++ b/drivers/thermal/qcom/Makefile
@@ -1,2 +1,3 @@
 obj-$(CONFIG_QCOM_TSENS)       += qcom_tsens.o
 qcom_tsens-y                   += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-v2.o
+obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM)     += qcom-spmi-temp-alarm.o

diff --git a/drivers/thermal/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
similarity index 99%
rename from drivers/thermal/qcom-spmi-temp-alarm.c
rename to drivers/thermal/qcom/qcom-spmi-temp-alarm.c
index b2d5d5bf4a9bd1638eb53b8f5d420e719f0ad140..c1fd71dbab3ebb2e9ee338f4f38590aa8e3904d4 100644 (file)
--- a/drivers/thermal/qcom-spmi-temp-alarm.c
+++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
@@ -23,7 +23,7 @@
 #include <linux/regmap.h>
 #include <linux/thermal.h>
 
-#include "thermal_core.h"
+#include "../thermal_core.h"
 
 #define QPNP_TM_REG_TYPE               0x04
 #define QPNP_TM_REG_SUBTYPE            0x05