* [PATCH v2 1/2] drivers: thermal: Move various drivers for intel platforms into a subdir
2018-10-04 7:52 [PATCH v2 0/2] driver: thermal: Move some drivers into subdirs Amit Kucheria
@ 2018-10-04 7:52 ` Amit Kucheria
2018-10-04 7:52 ` [PATCH v2 2/2] drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir Amit Kucheria
2018-10-26 8:51 ` [PATCH v2 0/2] driver: thermal: Move some drivers into subdirs Amit Kucheria
2 siblings, 0 replies; 7+ messages in thread
From: Amit Kucheria @ 2018-10-04 7:52 UTC (permalink / raw)
To: linux-kernel; +Cc: mka, rui.zhang, edubezval, Daniel Lezcano
This cleans up the directory a bit, now that we have several other
platforms using platform-specific sub-directories. Compile-tested with
ARCH=x86 defconfig and the drivers explicitly enabled with menuconfig.
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/thermal/Kconfig | 83 ++-----------------
drivers/thermal/Makefile | 9 +-
drivers/thermal/intel/Kconfig | 77 +++++++++++++++++
drivers/thermal/intel/Makefile | 12 +++
.../{ => intel}/int340x_thermal/Kconfig | 0
.../{ => intel}/int340x_thermal/Makefile | 0
.../int340x_thermal/acpi_thermal_rel.c | 0
.../int340x_thermal/acpi_thermal_rel.h | 0
.../int340x_thermal/int3400_thermal.c | 0
.../int340x_thermal/int3402_thermal.c | 0
.../int340x_thermal/int3403_thermal.c | 0
.../int340x_thermal/int3406_thermal.c | 0
.../int340x_thermal/int340x_thermal_zone.c | 0
.../int340x_thermal/int340x_thermal_zone.h | 0
.../processor_thermal_device.c | 0
.../{ => intel}/intel_bxt_pmic_thermal.c | 0
.../thermal/{ => intel}/intel_pch_thermal.c | 0
.../thermal/{ => intel}/intel_powerclamp.c | 0
.../{ => intel}/intel_quark_dts_thermal.c | 0
.../thermal/{ => intel}/intel_soc_dts_iosf.c | 0
.../thermal/{ => intel}/intel_soc_dts_iosf.h | 0
.../{ => intel}/intel_soc_dts_thermal.c | 0
.../{ => intel}/x86_pkg_temp_thermal.c | 0
23 files changed, 95 insertions(+), 86 deletions(-)
create mode 100644 drivers/thermal/intel/Kconfig
create mode 100644 drivers/thermal/intel/Makefile
rename drivers/thermal/{ => intel}/int340x_thermal/Kconfig (100%)
rename drivers/thermal/{ => intel}/int340x_thermal/Makefile (100%)
rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.c (100%)
rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.h (100%)
rename drivers/thermal/{ => intel}/int340x_thermal/int3400_thermal.c (100%)
rename drivers/thermal/{ => intel}/int340x_thermal/int3402_thermal.c (100%)
rename drivers/thermal/{ => intel}/int340x_thermal/int3403_thermal.c (100%)
rename drivers/thermal/{ => intel}/int340x_thermal/int3406_thermal.c (100%)
rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.c (100%)
rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.h (100%)
rename drivers/thermal/{ => intel}/int340x_thermal/processor_thermal_device.c (100%)
rename drivers/thermal/{ => intel}/intel_bxt_pmic_thermal.c (100%)
rename drivers/thermal/{ => intel}/intel_pch_thermal.c (100%)
rename drivers/thermal/{ => intel}/intel_powerclamp.c (100%)
rename drivers/thermal/{ => intel}/intel_quark_dts_thermal.c (100%)
rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.c (100%)
rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.h (100%)
rename drivers/thermal/{ => intel}/intel_soc_dts_thermal.c (100%)
rename drivers/thermal/{ => intel}/x86_pkg_temp_thermal.c (100%)
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 0e69edc77d18..6f18110f1480 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -326,84 +326,6 @@ config DA9062_THERMAL
zone.
Compatible with the DA9062 and DA9061 PMICs.
-config INTEL_POWERCLAMP
- tristate "Intel PowerClamp idle injection driver"
- depends on THERMAL
- depends on X86
- depends on CPU_SUP_INTEL
- help
- Enable this to enable Intel PowerClamp idle injection driver. This
- enforce idle time which results in more package C-state residency. The
- user interface is exposed via generic thermal framework.
-
-config X86_PKG_TEMP_THERMAL
- tristate "X86 package temperature thermal driver"
- depends on X86_THERMAL_VECTOR
- select THERMAL_GOV_USER_SPACE
- select THERMAL_WRITABLE_TRIPS
- default m
- help
- Enable this to register CPU digital sensor for package temperature as
- thermal zone. Each package will have its own thermal zone. There are
- two trip points which can be set by user to get notifications via thermal
- notification methods.
-
-config INTEL_SOC_DTS_IOSF_CORE
- tristate
- depends on X86 && PCI
- select IOSF_MBI
- help
- This is becoming a common feature for Intel SoCs to expose the additional
- digital temperature sensors (DTSs) using side band interface (IOSF). This
- implements the common set of helper functions to register, get temperature
- and get/set thresholds on DTSs.
-
-config INTEL_SOC_DTS_THERMAL
- tristate "Intel SoCs DTS thermal driver"
- depends on X86 && PCI && ACPI
- select INTEL_SOC_DTS_IOSF_CORE
- select THERMAL_WRITABLE_TRIPS
- help
- Enable this to register Intel SoCs (e.g. Bay Trail) platform digital
- temperature sensor (DTS). These SoCs have two additional DTSs in
- addition to DTSs on CPU cores. Each DTS will be registered as a
- thermal zone. There are two trip points. One of the trip point can
- be set by user mode programs to get notifications via Linux thermal
- notification methods.The other trip is a critical trip point, which
- was set by the driver based on the TJ MAX temperature.
-
-config INTEL_QUARK_DTS_THERMAL
- tristate "Intel Quark DTS thermal driver"
- depends on X86_INTEL_QUARK
- help
- Enable this to register Intel Quark SoC (e.g. X1000) platform digital
- temperature sensor (DTS). For X1000 SoC, it has one on-die DTS.
- The DTS will be registered as a thermal zone. There are two trip points:
- hot & critical. The critical trip point default value is set by
- underlying BIOS/Firmware.
-
-menu "ACPI INT340X thermal drivers"
-source drivers/thermal/int340x_thermal/Kconfig
-endmenu
-
-config INTEL_BXT_PMIC_THERMAL
- tristate "Intel Broxton PMIC thermal driver"
- depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP
- help
- Select this driver for Intel Broxton PMIC with ADC channels monitoring
- system temperature measurements and alerts.
- This driver is used for monitoring the ADC channels of PMIC and handles
- the alert trip point interrupts and notifies the thermal framework with
- the trip point and temperature details of the zone.
-
-config INTEL_PCH_THERMAL
- tristate "Intel PCH Thermal Reporting Driver"
- depends on X86 && PCI
- help
- Enable this to support thermal reporting on certain intel PCHs.
- Thermal reporting device will provide temperature reading,
- programmable trip points and other information.
-
config MTK_THERMAL
tristate "Temperature sensor driver for mediatek SoCs"
depends on ARCH_MEDIATEK || COMPILE_TEST
@@ -415,6 +337,11 @@ config MTK_THERMAL
Enable this option if you want to have support for thermal management
controller present in Mediatek SoCs
+menu "Intel thermal drivers"
+depends on X86 || X86_INTEL_QUARK || COMPILE_TEST
+source "drivers/thermal/intel/Kconfig"
+endmenu
+
menu "Broadcom thermal drivers"
depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST
source "drivers/thermal/broadcom/Kconfig"
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 610344eb3e03..031f61e7dfe8 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -44,15 +44,8 @@ obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o
obj-$(CONFIG_MAX77620_THERMAL) += max77620_thermal.o
obj-$(CONFIG_QORIQ_THERMAL) += qoriq_thermal.o
obj-$(CONFIG_DA9062_THERMAL) += da9062-thermal.o
-obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
-obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o
-obj-$(CONFIG_INTEL_SOC_DTS_IOSF_CORE) += intel_soc_dts_iosf.o
-obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += intel_soc_dts_thermal.o
-obj-$(CONFIG_INTEL_QUARK_DTS_THERMAL) += intel_quark_dts_thermal.o
+obj-y += intel/
obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
-obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/
-obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) += intel_bxt_pmic_thermal.o
-obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o
obj-$(CONFIG_ST_THERMAL) += st/
obj-$(CONFIG_QCOM_TSENS) += qcom/
obj-y += tegra/
diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig
new file mode 100644
index 000000000000..9c06d4ad7c97
--- /dev/null
+++ b/drivers/thermal/intel/Kconfig
@@ -0,0 +1,77 @@
+config INTEL_POWERCLAMP
+ tristate "Intel PowerClamp idle injection driver"
+ depends on THERMAL
+ depends on X86
+ depends on CPU_SUP_INTEL
+ help
+ Enable this to enable Intel PowerClamp idle injection driver. This
+ enforce idle time which results in more package C-state residency. The
+ user interface is exposed via generic thermal framework.
+
+config X86_PKG_TEMP_THERMAL
+ tristate "X86 package temperature thermal driver"
+ depends on X86_THERMAL_VECTOR
+ select THERMAL_GOV_USER_SPACE
+ select THERMAL_WRITABLE_TRIPS
+ default m
+ help
+ Enable this to register CPU digital sensor for package temperature as
+ thermal zone. Each package will have its own thermal zone. There are
+ two trip points which can be set by user to get notifications via thermal
+ notification methods.
+
+config INTEL_SOC_DTS_IOSF_CORE
+ tristate
+ depends on X86 && PCI
+ select IOSF_MBI
+ help
+ This is becoming a common feature for Intel SoCs to expose the additional
+ digital temperature sensors (DTSs) using side band interface (IOSF). This
+ implements the common set of helper functions to register, get temperature
+ and get/set thresholds on DTSs.
+
+config INTEL_SOC_DTS_THERMAL
+ tristate "Intel SoCs DTS thermal driver"
+ depends on X86 && PCI && ACPI
+ select INTEL_SOC_DTS_IOSF_CORE
+ select THERMAL_WRITABLE_TRIPS
+ help
+ Enable this to register Intel SoCs (e.g. Bay Trail) platform digital
+ temperature sensor (DTS). These SoCs have two additional DTSs in
+ addition to DTSs on CPU cores. Each DTS will be registered as a
+ thermal zone. There are two trip points. One of the trip point can
+ be set by user mode programs to get notifications via Linux thermal
+ notification methods.The other trip is a critical trip point, which
+ was set by the driver based on the TJ MAX temperature.
+
+config INTEL_QUARK_DTS_THERMAL
+ tristate "Intel Quark DTS thermal driver"
+ depends on X86_INTEL_QUARK
+ help
+ Enable this to register Intel Quark SoC (e.g. X1000) platform digital
+ temperature sensor (DTS). For X1000 SoC, it has one on-die DTS.
+ The DTS will be registered as a thermal zone. There are two trip points:
+ hot & critical. The critical trip point default value is set by
+ underlying BIOS/Firmware.
+
+menu "ACPI INT340X thermal drivers"
+source drivers/thermal/intel/int340x_thermal/Kconfig
+endmenu
+
+config INTEL_BXT_PMIC_THERMAL
+ tristate "Intel Broxton PMIC thermal driver"
+ depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP
+ help
+ Select this driver for Intel Broxton PMIC with ADC channels monitoring
+ system temperature measurements and alerts.
+ This driver is used for monitoring the ADC channels of PMIC and handles
+ the alert trip point interrupts and notifies the thermal framework with
+ the trip point and temperature details of the zone.
+
+config INTEL_PCH_THERMAL
+ tristate "Intel PCH Thermal Reporting Driver"
+ depends on X86 && PCI
+ help
+ Enable this to support thermal reporting on certain intel PCHs.
+ Thermal reporting device will provide temperature reading,
+ programmable trip points and other information.
diff --git a/drivers/thermal/intel/Makefile b/drivers/thermal/intel/Makefile
new file mode 100644
index 000000000000..0d9736ced5d4
--- /dev/null
+++ b/drivers/thermal/intel/Makefile
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for various Intel thermal drivers.
+
+obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
+obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o
+obj-$(CONFIG_INTEL_SOC_DTS_IOSF_CORE) += intel_soc_dts_iosf.o
+obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += intel_soc_dts_thermal.o
+obj-$(CONFIG_INTEL_QUARK_DTS_THERMAL) += intel_quark_dts_thermal.o
+obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/
+obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) += intel_bxt_pmic_thermal.o
+obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o
diff --git a/drivers/thermal/int340x_thermal/Kconfig b/drivers/thermal/intel/int340x_thermal/Kconfig
similarity index 100%
rename from drivers/thermal/int340x_thermal/Kconfig
rename to drivers/thermal/intel/int340x_thermal/Kconfig
diff --git a/drivers/thermal/int340x_thermal/Makefile b/drivers/thermal/intel/int340x_thermal/Makefile
similarity index 100%
rename from drivers/thermal/int340x_thermal/Makefile
rename to drivers/thermal/intel/int340x_thermal/Makefile
diff --git a/drivers/thermal/int340x_thermal/acpi_thermal_rel.c b/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c
similarity index 100%
rename from drivers/thermal/int340x_thermal/acpi_thermal_rel.c
rename to drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c
diff --git a/drivers/thermal/int340x_thermal/acpi_thermal_rel.h b/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.h
similarity index 100%
rename from drivers/thermal/int340x_thermal/acpi_thermal_rel.h
rename to drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.h
diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
similarity index 100%
rename from drivers/thermal/int340x_thermal/int3400_thermal.c
rename to drivers/thermal/intel/int340x_thermal/int3400_thermal.c
diff --git a/drivers/thermal/int340x_thermal/int3402_thermal.c b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c
similarity index 100%
rename from drivers/thermal/int340x_thermal/int3402_thermal.c
rename to drivers/thermal/intel/int340x_thermal/int3402_thermal.c
diff --git a/drivers/thermal/int340x_thermal/int3403_thermal.c b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
similarity index 100%
rename from drivers/thermal/int340x_thermal/int3403_thermal.c
rename to drivers/thermal/intel/int340x_thermal/int3403_thermal.c
diff --git a/drivers/thermal/int340x_thermal/int3406_thermal.c b/drivers/thermal/intel/int340x_thermal/int3406_thermal.c
similarity index 100%
rename from drivers/thermal/int340x_thermal/int3406_thermal.c
rename to drivers/thermal/intel/int340x_thermal/int3406_thermal.c
diff --git a/drivers/thermal/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
similarity index 100%
rename from drivers/thermal/int340x_thermal/int340x_thermal_zone.c
rename to drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
diff --git a/drivers/thermal/int340x_thermal/int340x_thermal_zone.h b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
similarity index 100%
rename from drivers/thermal/int340x_thermal/int340x_thermal_zone.h
rename to drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
diff --git a/drivers/thermal/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
similarity index 100%
rename from drivers/thermal/int340x_thermal/processor_thermal_device.c
rename to drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
diff --git a/drivers/thermal/intel_bxt_pmic_thermal.c b/drivers/thermal/intel/intel_bxt_pmic_thermal.c
similarity index 100%
rename from drivers/thermal/intel_bxt_pmic_thermal.c
rename to drivers/thermal/intel/intel_bxt_pmic_thermal.c
diff --git a/drivers/thermal/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c
similarity index 100%
rename from drivers/thermal/intel_pch_thermal.c
rename to drivers/thermal/intel/intel_pch_thermal.c
diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel/intel_powerclamp.c
similarity index 100%
rename from drivers/thermal/intel_powerclamp.c
rename to drivers/thermal/intel/intel_powerclamp.c
diff --git a/drivers/thermal/intel_quark_dts_thermal.c b/drivers/thermal/intel/intel_quark_dts_thermal.c
similarity index 100%
rename from drivers/thermal/intel_quark_dts_thermal.c
rename to drivers/thermal/intel/intel_quark_dts_thermal.c
diff --git a/drivers/thermal/intel_soc_dts_iosf.c b/drivers/thermal/intel/intel_soc_dts_iosf.c
similarity index 100%
rename from drivers/thermal/intel_soc_dts_iosf.c
rename to drivers/thermal/intel/intel_soc_dts_iosf.c
diff --git a/drivers/thermal/intel_soc_dts_iosf.h b/drivers/thermal/intel/intel_soc_dts_iosf.h
similarity index 100%
rename from drivers/thermal/intel_soc_dts_iosf.h
rename to drivers/thermal/intel/intel_soc_dts_iosf.h
diff --git a/drivers/thermal/intel_soc_dts_thermal.c b/drivers/thermal/intel/intel_soc_dts_thermal.c
similarity index 100%
rename from drivers/thermal/intel_soc_dts_thermal.c
rename to drivers/thermal/intel/intel_soc_dts_thermal.c
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/intel/x86_pkg_temp_thermal.c
similarity index 100%
rename from drivers/thermal/x86_pkg_temp_thermal.c
rename to drivers/thermal/intel/x86_pkg_temp_thermal.c
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 2/2] drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir
2018-10-04 7:52 [PATCH v2 0/2] driver: thermal: Move some drivers into subdirs Amit Kucheria
2018-10-04 7:52 ` [PATCH v2 1/2] drivers: thermal: Move various drivers for intel platforms into a subdir Amit Kucheria
@ 2018-10-04 7:52 ` Amit Kucheria
2018-10-26 8:51 ` [PATCH v2 0/2] driver: thermal: Move some drivers into subdirs Amit Kucheria
2 siblings, 0 replies; 7+ messages in thread
From: Amit Kucheria @ 2018-10-04 7:52 UTC (permalink / raw)
To: linux-kernel; +Cc: mka, rui.zhang, edubezval, Daniel Lezcano
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>
---
drivers/thermal/Kconfig | 11 -----------
drivers/thermal/Makefile | 1 -
drivers/thermal/qcom/Kconfig | 11 +++++++++++
drivers/thermal/qcom/Makefile | 1 +
drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c | 0
5 files changed, 12 insertions(+), 12 deletions(-)
rename drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c (100%)
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 6f18110f1480..c075f1190e63 100644
--- 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 031f61e7dfe8..415361685480 100644
--- 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 be32e5abce3c..cdb455ffd575 100644
--- 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 a821929ede0b..717a08600bb5 100644
--- 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 100%
rename from drivers/thermal/qcom-spmi-temp-alarm.c
rename to drivers/thermal/qcom/qcom-spmi-temp-alarm.c
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 0/2] driver: thermal: Move some drivers into subdirs
2018-10-04 7:52 [PATCH v2 0/2] driver: thermal: Move some drivers into subdirs Amit Kucheria
2018-10-04 7:52 ` [PATCH v2 1/2] drivers: thermal: Move various drivers for intel platforms into a subdir Amit Kucheria
2018-10-04 7:52 ` [PATCH v2 2/2] drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir Amit Kucheria
@ 2018-10-26 8:51 ` Amit Kucheria
2018-11-22 18:47 ` Amit Kucheria
2 siblings, 1 reply; 7+ messages in thread
From: Amit Kucheria @ 2018-10-26 8:51 UTC (permalink / raw)
To: LKML
Cc: Matthias Kaehlcke, Zhang Rui, Eduardo Valentin, Daniel Lezcano,
Linux PM list
Hi Rui,
On Thu, Oct 4, 2018 at 1:22 PM Amit Kucheria <amit.kucheria@linaro.org> wrote:
>
> Move the various drivers for Intel platforms into their own subdir. Also
> consolidate Qualcomm drivers into the qcom subdir.
>
> This cleans up the directory making it easier to find things.
Any comments on these changes?
> There is no great time to send patches that move files around, but I'm told
> that towards the end of the merge window is nicer. So here's an attempt to
> sneak it into 4.20 after everything else and hoping that these files won't
> change after 4.19-rc6. :-)
>
> This was generated and compile-tested against 4.19-rc6. If you would like
> me to try again a bit later, I'm happy to do so.
>
> Changes since v1:
> - Removed a stray character that snuck into the Makefile
> - Added Acks
> - Rebased to v4.19-rc6
>
> Amit Kucheria (2):
> drivers: thermal: Move various drivers for intel platforms into a
> subdir
> drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir
>
> drivers/thermal/Kconfig | 94 +------------------
> drivers/thermal/Makefile | 10 +-
> drivers/thermal/intel/Kconfig | 77 +++++++++++++++
> drivers/thermal/intel/Makefile | 12 +++
> .../{ => intel}/int340x_thermal/Kconfig | 0
> .../{ => intel}/int340x_thermal/Makefile | 0
> .../int340x_thermal/acpi_thermal_rel.c | 0
> .../int340x_thermal/acpi_thermal_rel.h | 0
> .../int340x_thermal/int3400_thermal.c | 0
> .../int340x_thermal/int3402_thermal.c | 0
> .../int340x_thermal/int3403_thermal.c | 0
> .../int340x_thermal/int3406_thermal.c | 0
> .../int340x_thermal/int340x_thermal_zone.c | 0
> .../int340x_thermal/int340x_thermal_zone.h | 0
> .../processor_thermal_device.c | 0
> .../{ => intel}/intel_bxt_pmic_thermal.c | 0
> .../thermal/{ => intel}/intel_pch_thermal.c | 0
> .../thermal/{ => intel}/intel_powerclamp.c | 0
> .../{ => intel}/intel_quark_dts_thermal.c | 0
> .../thermal/{ => intel}/intel_soc_dts_iosf.c | 0
> .../thermal/{ => intel}/intel_soc_dts_iosf.h | 0
> .../{ => intel}/intel_soc_dts_thermal.c | 0
> .../{ => intel}/x86_pkg_temp_thermal.c | 0
> drivers/thermal/qcom/Kconfig | 11 +++
> drivers/thermal/qcom/Makefile | 1 +
> .../thermal/{ => qcom}/qcom-spmi-temp-alarm.c | 0
> 26 files changed, 107 insertions(+), 98 deletions(-)
> create mode 100644 drivers/thermal/intel/Kconfig
> create mode 100644 drivers/thermal/intel/Makefile
> rename drivers/thermal/{ => intel}/int340x_thermal/Kconfig (100%)
> rename drivers/thermal/{ => intel}/int340x_thermal/Makefile (100%)
> rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.c (100%)
> rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.h (100%)
> rename drivers/thermal/{ => intel}/int340x_thermal/int3400_thermal.c (100%)
> rename drivers/thermal/{ => intel}/int340x_thermal/int3402_thermal.c (100%)
> rename drivers/thermal/{ => intel}/int340x_thermal/int3403_thermal.c (100%)
> rename drivers/thermal/{ => intel}/int340x_thermal/int3406_thermal.c (100%)
> rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.c (100%)
> rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.h (100%)
> rename drivers/thermal/{ => intel}/int340x_thermal/processor_thermal_device.c (100%)
> rename drivers/thermal/{ => intel}/intel_bxt_pmic_thermal.c (100%)
> rename drivers/thermal/{ => intel}/intel_pch_thermal.c (100%)
> rename drivers/thermal/{ => intel}/intel_powerclamp.c (100%)
> rename drivers/thermal/{ => intel}/intel_quark_dts_thermal.c (100%)
> rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.c (100%)
> rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.h (100%)
> rename drivers/thermal/{ => intel}/intel_soc_dts_thermal.c (100%)
> rename drivers/thermal/{ => intel}/x86_pkg_temp_thermal.c (100%)
> rename drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c (100%)
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2 0/2] driver: thermal: Move some drivers into subdirs
2018-10-26 8:51 ` [PATCH v2 0/2] driver: thermal: Move some drivers into subdirs Amit Kucheria
@ 2018-11-22 18:47 ` Amit Kucheria
2018-11-26 7:56 ` Zhang Rui
0 siblings, 1 reply; 7+ messages in thread
From: Amit Kucheria @ 2018-11-22 18:47 UTC (permalink / raw)
To: LKML
Cc: Matthias Kaehlcke, Zhang Rui, Eduardo Valentin, Daniel Lezcano,
Linux PM list
On Fri, Oct 26, 2018 at 2:21 PM Amit Kucheria <amit.kucheria@linaro.org> wrote:
>
> Hi Rui,
>
> On Thu, Oct 4, 2018 at 1:22 PM Amit Kucheria <amit.kucheria@linaro.org> wrote:
> >
> > Move the various drivers for Intel platforms into their own subdir. Also
> > consolidate Qualcomm drivers into the qcom subdir.
> >
> > This cleans up the directory making it easier to find things.
>
> Any comments on these changes?
Rui? Eduardo?
> > There is no great time to send patches that move files around, but I'm told
> > that towards the end of the merge window is nicer. So here's an attempt to
> > sneak it into 4.20 after everything else and hoping that these files won't
> > change after 4.19-rc6. :-)
> >
> > This was generated and compile-tested against 4.19-rc6. If you would like
> > me to try again a bit later, I'm happy to do so.
> >
> > Changes since v1:
> > - Removed a stray character that snuck into the Makefile
> > - Added Acks
> > - Rebased to v4.19-rc6
> >
> > Amit Kucheria (2):
> > drivers: thermal: Move various drivers for intel platforms into a
> > subdir
> > drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir
> >
> > drivers/thermal/Kconfig | 94 +------------------
> > drivers/thermal/Makefile | 10 +-
> > drivers/thermal/intel/Kconfig | 77 +++++++++++++++
> > drivers/thermal/intel/Makefile | 12 +++
> > .../{ => intel}/int340x_thermal/Kconfig | 0
> > .../{ => intel}/int340x_thermal/Makefile | 0
> > .../int340x_thermal/acpi_thermal_rel.c | 0
> > .../int340x_thermal/acpi_thermal_rel.h | 0
> > .../int340x_thermal/int3400_thermal.c | 0
> > .../int340x_thermal/int3402_thermal.c | 0
> > .../int340x_thermal/int3403_thermal.c | 0
> > .../int340x_thermal/int3406_thermal.c | 0
> > .../int340x_thermal/int340x_thermal_zone.c | 0
> > .../int340x_thermal/int340x_thermal_zone.h | 0
> > .../processor_thermal_device.c | 0
> > .../{ => intel}/intel_bxt_pmic_thermal.c | 0
> > .../thermal/{ => intel}/intel_pch_thermal.c | 0
> > .../thermal/{ => intel}/intel_powerclamp.c | 0
> > .../{ => intel}/intel_quark_dts_thermal.c | 0
> > .../thermal/{ => intel}/intel_soc_dts_iosf.c | 0
> > .../thermal/{ => intel}/intel_soc_dts_iosf.h | 0
> > .../{ => intel}/intel_soc_dts_thermal.c | 0
> > .../{ => intel}/x86_pkg_temp_thermal.c | 0
> > drivers/thermal/qcom/Kconfig | 11 +++
> > drivers/thermal/qcom/Makefile | 1 +
> > .../thermal/{ => qcom}/qcom-spmi-temp-alarm.c | 0
> > 26 files changed, 107 insertions(+), 98 deletions(-)
> > create mode 100644 drivers/thermal/intel/Kconfig
> > create mode 100644 drivers/thermal/intel/Makefile
> > rename drivers/thermal/{ => intel}/int340x_thermal/Kconfig (100%)
> > rename drivers/thermal/{ => intel}/int340x_thermal/Makefile (100%)
> > rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.c (100%)
> > rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.h (100%)
> > rename drivers/thermal/{ => intel}/int340x_thermal/int3400_thermal.c (100%)
> > rename drivers/thermal/{ => intel}/int340x_thermal/int3402_thermal.c (100%)
> > rename drivers/thermal/{ => intel}/int340x_thermal/int3403_thermal.c (100%)
> > rename drivers/thermal/{ => intel}/int340x_thermal/int3406_thermal.c (100%)
> > rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.c (100%)
> > rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.h (100%)
> > rename drivers/thermal/{ => intel}/int340x_thermal/processor_thermal_device.c (100%)
> > rename drivers/thermal/{ => intel}/intel_bxt_pmic_thermal.c (100%)
> > rename drivers/thermal/{ => intel}/intel_pch_thermal.c (100%)
> > rename drivers/thermal/{ => intel}/intel_powerclamp.c (100%)
> > rename drivers/thermal/{ => intel}/intel_quark_dts_thermal.c (100%)
> > rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.c (100%)
> > rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.h (100%)
> > rename drivers/thermal/{ => intel}/intel_soc_dts_thermal.c (100%)
> > rename drivers/thermal/{ => intel}/x86_pkg_temp_thermal.c (100%)
> > rename drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c (100%)
> >
> > --
> > 2.17.1
> >
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2 0/2] driver: thermal: Move some drivers into subdirs
2018-11-22 18:47 ` Amit Kucheria
@ 2018-11-26 7:56 ` Zhang Rui
2018-12-05 6:22 ` Amit Kucheria
0 siblings, 1 reply; 7+ messages in thread
From: Zhang Rui @ 2018-11-26 7:56 UTC (permalink / raw)
To: Amit Kucheria, LKML
Cc: Matthias Kaehlcke, Eduardo Valentin, Daniel Lezcano, Linux PM list
On 五, 2018-11-23 at 00:17 +0530, Amit Kucheria wrote:
> On Fri, Oct 26, 2018 at 2:21 PM Amit Kucheria <amit.kucheria@linaro.o
> rg> wrote:
> >
> >
> > Hi Rui,
> >
> > On Thu, Oct 4, 2018 at 1:22 PM Amit Kucheria <amit.kucheria@linaro.
> > org> wrote:
> > >
> > >
> > > Move the various drivers for Intel platforms into their own
> > > subdir. Also
> > > consolidate Qualcomm drivers into the qcom subdir.
> > >
> > > This cleans up the directory making it easier to find things.
> > Any comments on these changes?
> Rui? Eduardo?
>
the patches were not sent to linux-pm mailing list, and that's why I
overlooked this patch set in patchwork.
thanks,
rui
> >
> > >
> > > There is no great time to send patches that move files around,
> > > but I'm told
> > > that towards the end of the merge window is nicer. So here's an
> > > attempt to
> > > sneak it into 4.20 after everything else and hoping that these
> > > files won't
> > > change after 4.19-rc6. :-)
> > >
> > > This was generated and compile-tested against 4.19-rc6. If you
> > > would like
> > > me to try again a bit later, I'm happy to do so.
> > >
> > > Changes since v1:
> > > - Removed a stray character that snuck into the Makefile
> > > - Added Acks
> > > - Rebased to v4.19-rc6
> > >
> > > Amit Kucheria (2):
> > > drivers: thermal: Move various drivers for intel platforms into
> > > a
> > > subdir
> > > drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom
> > > subdir
> > >
> > > drivers/thermal/Kconfig | 94 +----------
> > > --------
> > > drivers/thermal/Makefile | 10 +-
> > > drivers/thermal/intel/Kconfig | 77
> > > +++++++++++++++
> > > drivers/thermal/intel/Makefile | 12 +++
> > > .../{ => intel}/int340x_thermal/Kconfig | 0
> > > .../{ => intel}/int340x_thermal/Makefile | 0
> > > .../int340x_thermal/acpi_thermal_rel.c | 0
> > > .../int340x_thermal/acpi_thermal_rel.h | 0
> > > .../int340x_thermal/int3400_thermal.c | 0
> > > .../int340x_thermal/int3402_thermal.c | 0
> > > .../int340x_thermal/int3403_thermal.c | 0
> > > .../int340x_thermal/int3406_thermal.c | 0
> > > .../int340x_thermal/int340x_thermal_zone.c | 0
> > > .../int340x_thermal/int340x_thermal_zone.h | 0
> > > .../processor_thermal_device.c | 0
> > > .../{ => intel}/intel_bxt_pmic_thermal.c | 0
> > > .../thermal/{ => intel}/intel_pch_thermal.c | 0
> > > .../thermal/{ => intel}/intel_powerclamp.c | 0
> > > .../{ => intel}/intel_quark_dts_thermal.c | 0
> > > .../thermal/{ => intel}/intel_soc_dts_iosf.c | 0
> > > .../thermal/{ => intel}/intel_soc_dts_iosf.h | 0
> > > .../{ => intel}/intel_soc_dts_thermal.c | 0
> > > .../{ => intel}/x86_pkg_temp_thermal.c | 0
> > > drivers/thermal/qcom/Kconfig | 11 +++
> > > drivers/thermal/qcom/Makefile | 1 +
> > > .../thermal/{ => qcom}/qcom-spmi-temp-alarm.c | 0
> > > 26 files changed, 107 insertions(+), 98 deletions(-)
> > > create mode 100644 drivers/thermal/intel/Kconfig
> > > create mode 100644 drivers/thermal/intel/Makefile
> > > rename drivers/thermal/{ => intel}/int340x_thermal/Kconfig
> > > (100%)
> > > rename drivers/thermal/{ => intel}/int340x_thermal/Makefile
> > > (100%)
> > > rename drivers/thermal/{ =>
> > > intel}/int340x_thermal/acpi_thermal_rel.c (100%)
> > > rename drivers/thermal/{ =>
> > > intel}/int340x_thermal/acpi_thermal_rel.h (100%)
> > > rename drivers/thermal/{ =>
> > > intel}/int340x_thermal/int3400_thermal.c (100%)
> > > rename drivers/thermal/{ =>
> > > intel}/int340x_thermal/int3402_thermal.c (100%)
> > > rename drivers/thermal/{ =>
> > > intel}/int340x_thermal/int3403_thermal.c (100%)
> > > rename drivers/thermal/{ =>
> > > intel}/int340x_thermal/int3406_thermal.c (100%)
> > > rename drivers/thermal/{ =>
> > > intel}/int340x_thermal/int340x_thermal_zone.c (100%)
> > > rename drivers/thermal/{ =>
> > > intel}/int340x_thermal/int340x_thermal_zone.h (100%)
> > > rename drivers/thermal/{ =>
> > > intel}/int340x_thermal/processor_thermal_device.c (100%)
> > > rename drivers/thermal/{ => intel}/intel_bxt_pmic_thermal.c
> > > (100%)
> > > rename drivers/thermal/{ => intel}/intel_pch_thermal.c (100%)
> > > rename drivers/thermal/{ => intel}/intel_powerclamp.c (100%)
> > > rename drivers/thermal/{ => intel}/intel_quark_dts_thermal.c
> > > (100%)
> > > rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.c (100%)
> > > rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.h (100%)
> > > rename drivers/thermal/{ => intel}/intel_soc_dts_thermal.c
> > > (100%)
> > > rename drivers/thermal/{ => intel}/x86_pkg_temp_thermal.c (100%)
> > > rename drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c (100%)
> > >
> > > --
> > > 2.17.1
> > >
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2 0/2] driver: thermal: Move some drivers into subdirs
2018-11-26 7:56 ` Zhang Rui
@ 2018-12-05 6:22 ` Amit Kucheria
0 siblings, 0 replies; 7+ messages in thread
From: Amit Kucheria @ 2018-12-05 6:22 UTC (permalink / raw)
To: Zhang Rui
Cc: LKML, Matthias Kaehlcke, Eduardo Valentin, Daniel Lezcano, Linux PM list
On Mon, Nov 26, 2018 at 1:26 PM Zhang Rui <rui.zhang@intel.com> wrote:
>
> On 五, 2018-11-23 at 00:17 +0530, Amit Kucheria wrote:
> > On Fri, Oct 26, 2018 at 2:21 PM Amit Kucheria <amit.kucheria@linaro.o
> > rg> wrote:
> > >
> > >
> > > Hi Rui,
> > >
> > > On Thu, Oct 4, 2018 at 1:22 PM Amit Kucheria <amit.kucheria@linaro.
> > > org> wrote:
> > > >
> > > >
> > > > Move the various drivers for Intel platforms into their own
> > > > subdir. Also
> > > > consolidate Qualcomm drivers into the qcom subdir.
> > > >
> > > > This cleans up the directory making it easier to find things.
> > > Any comments on these changes?
> > Rui? Eduardo?
> >
> the patches were not sent to linux-pm mailing list, and that's why I
> overlooked this patch set in patchwork.
>
> thanks,
> rui
Hi Rui,
I've sent a new version with linux-pm in cc.
Regards,
Amit
^ permalink raw reply [flat|nested] 7+ messages in thread