Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72e9baf9 authored by Amit Kucheria's avatar Amit Kucheria Committed by Zhang Rui
Browse files

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: default avatarAmit Kucheria <amit.kucheria@linaro.org>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 3e8c4d31

drivers/thermal/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -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

drivers/thermal/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/thermal/qcom/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -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.

drivers/thermal/qcom/Makefile

+1 −0
Original line number Diff line number Diff line 
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

drivers/thermal/qcom-spmi-temp-alarm.c→drivers/thermal/qcom/qcom-spmi-temp-alarm.c

+1 −1
Original line number Diff line number Diff line
@@ -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