thermal: remove obsolete drivers
Subsystems (2)
cover thermal: remove obsolete drivers
From: Arnd Bergmann <[email protected]>
A few Arm platforms are getting removed in v5.12, this removes the corresponding thermal drivers.
Arnd Bergmann (2):
thermal: remove tango driver
thermal: remove zx driver
.../bindings/thermal/tango-thermal.txt | 17 -- .../bindings/thermal/zx2967-thermal.txt | 116 -------- drivers/thermal/Kconfig | 17 -- drivers/thermal/Makefile | 2 - drivers/thermal/tango_thermal.c | 126 --------- drivers/thermal/zx2967_thermal.c | 256 ------------------ 6 files changed, 534 deletions(-) delete mode 100644 Documentation/devicetree/bindings/thermal/tango-thermal.txt delete mode 100644 Documentation/devicetree/bindings/thermal/zx2967-thermal.txt delete mode 100644 drivers/thermal/tango_thermal.c delete mode 100644 drivers/thermal/zx2967_thermal.c
Signature · 1 line
2.29.2
PATCH 1/2 thermal: remove tango driver
From: Arnd Bergmann <[email protected]>
The tango platform is getting removed, so the driver is no longer needed.
--- .../bindings/thermal/tango-thermal.txt | 17 --- drivers/thermal/Kconfig | 9 -- drivers/thermal/Makefile | 1 - drivers/thermal/tango_thermal.c | 126 ------------------ 4 files changed, 153 deletions(-) delete mode 100644 Documentation/devicetree/bindings/thermal/tango-thermal.txt delete mode 100644 drivers/thermal/tango_thermal.c
Documentation/devicetree/bindings/thermal/tango-thermal.txt deleted +0 -17
@@ -1,17 +0,0 @@ -* Tango Thermal - -The SMP8758 SoC includes 3 instances of this temperature sensor -(in the CPU, video decoder, and PCIe controller). - -Required properties: -- #thermal-sensor-cells: Should be 0 (see Documentation/devicetree/bindings/thermal/thermal-sensor.yaml) -- compatible: "sigma,smp8758-thermal" -- reg: Address range of the thermal registers - -Example: - - cpu_temp: thermal@920100 { - #thermal-sensor-cells = <0>; - compatible = "sigma,smp8758-thermal"; - reg = <0x920100 12>; - };
drivers/thermal/Kconfig +0 -9
@@ -450,15 +450,6 @@ depends on (ARCH_STI || ARCH_STM32) && OF source "drivers/thermal/st/Kconfig" endmenu -config TANGO_THERMAL - tristate "Tango thermal management" - depends on ARCH_TANGO || COMPILE_TEST - help - Enable the Tango thermal driver, which supports the primitive - temperature sensor embedded in Tango chips since the SMP8758. - This sensor only generates a 1-bit signal to indicate whether - the die temperature exceeds a programmable threshold. - source "drivers/thermal/tegra/Kconfig" config GENERIC_ADC_THERMAL
drivers/thermal/Makefile +0 -1
@@ -42,7 +42,6 @@ obj-y += samsung/ obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o -obj-$(CONFIG_TANGO_THERMAL) += tango_thermal.o obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_IMX_SC_THERMAL) += imx_sc_thermal.o obj-$(CONFIG_IMX8MM_THERMAL) += imx8mm_thermal.o
drivers/thermal/tango_thermal.c deleted +0 -126
126 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 1/2] thermal: remove tango driver
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The tango platform is getting removed, so the driver is no longer needed.
Cc Marc Gonzalez <[email protected]>Cc Mans Rullgard <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>
Quoted 202 lines
--- .../bindings/thermal/tango-thermal.txt | 17 --- drivers/thermal/Kconfig | 9 -- drivers/thermal/Makefile | 1 - drivers/thermal/tango_thermal.c | 126 ------------------ 4 files changed, 153 deletions(-) delete mode 100644 Documentation/devicetree/bindings/thermal/tango-thermal.txt delete mode 100644 drivers/thermal/tango_thermal.cDocumentation/devicetree/bindings/thermal/tango-thermal.txt deleted +0
-17@@ -1,17 +0,0 @@ -* Tango Thermal - -The SMP8758 SoC includes 3 instances of this temperature sensor -(in the CPU, video decoder, and PCIe controller). - -Required properties: -- #thermal-sensor-cells: Should be 0 (see Documentation/devicetree/bindings/thermal/thermal-sensor.yaml) -- compatible: "sigma,smp8758-thermal" -- reg: Address range of the thermal registers - -Example: - - cpu_temp: thermal@920100 { - #thermal-sensor-cells = <0>; - compatible = "sigma,smp8758-thermal"; - reg = <0x920100 12>; - };drivers/thermal/Kconfig +0
-9@@ -450,15 +450,6 @@ depends on (ARCH_STI || ARCH_STM32) && OF source "drivers/thermal/st/Kconfig" endmenu -config TANGO_THERMAL - tristate "Tango thermal management" - depends on ARCH_TANGO || COMPILE_TEST - help - Enable the Tango thermal driver, which supports the primitive - temperature sensor embedded in Tango chips since the SMP8758. - This sensor only generates a 1-bit signal to indicate whether - the die temperature exceeds a programmable threshold. - source "drivers/thermal/tegra/Kconfig" config GENERIC_ADC_THERMALdrivers/thermal/Makefile +0
-1@@ -42,7 +42,6 @@ obj-y += samsung/ obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o -obj-$(CONFIG_TANGO_THERMAL) += tango_thermal.o obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_IMX_SC_THERMAL) += imx_sc_thermal.o obj-$(CONFIG_IMX8MM_THERMAL) += imx8mm_thermal.odrivers/thermal/tango_thermal.c deleted +0
-126@@ -1,126 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -#include <linux/io.h> -#include <linux/delay.h> -#include <linux/module.h> -#include <linux/thermal.h> -#include <linux/platform_device.h> - -/* -* According to a data sheet draft, "this temperature sensor uses a bandgap -* type of circuit to compare a voltage which has a negative temperature -* coefficient with a voltage that is proportional to absolute temperature. -* A resistor bank allows 41 different temperature thresholds to be selected -* and the logic output will then indicate whether the actual die temperature -* lies above or below the selected threshold." -*/ - -#define TEMPSI_CMD 0 -#define TEMPSI_RES 4 -#define TEMPSI_CFG 8 - -#define CMD_OFF 0 -#define CMD_ON 1 -#define CMD_READ 2 - -#define IDX_MIN 15 -#define IDX_MAX 40 - -struct tango_thermal_priv { -void __iomem *base; -int thresh_idx; -}; - -static bool temp_above_thresh (void __iomem *base,int thresh_idx) -{ -writel (CMD_READ | thresh_idx <<8 , base +TEMPSI_CMD ); -usleep_range (10 ,20 ); -writel (CMD_READ | thresh_idx <<8 , base +TEMPSI_CMD ); - -return readl (base +TEMPSI_RES ); -} - -static int tango_get_temp (void *arg,int *res) -{ -struct tango_thermal_priv *priv = arg; -int idx = priv->thresh_idx; - -if (temp_above_thresh (priv->base, idx)) { -/* Search upward by incrementing thresh_idx */ -while (idx <IDX_MAX &&temp_above_thresh (priv->base, ++idx)) -cpu_relax (); - idx = idx -1 ;/* always return lower bound */ - }else { -/* Search downward by decrementing thresh_idx */ -while (idx >IDX_MIN && !temp_above_thresh (priv->base, --idx)) -cpu_relax (); - } - - *res = (idx *9 /2 -38 ) *1000 ;/* millidegrees Celsius */ - priv->thresh_idx = idx; - -return 0 ; -} - -static const struct thermal_zone_of_device_ops ops = { - .get_temp = tango_get_temp, -}; - -static void tango_thermal_init (struct tango_thermal_priv *priv) -{ -writel (0 , priv->base +TEMPSI_CFG ); -writel (CMD_ON , priv->base +TEMPSI_CMD ); -} - -static int tango_thermal_probe (struct platform_device *pdev) -{ -struct resource *res; -struct tango_thermal_priv *priv; -struct thermal_zone_device *tzdev; - - priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL ); -if (!priv) -return -ENOMEM ; - - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - priv->base =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (priv->base)) -return PTR_ERR (priv->base); - -platform_set_drvdata (pdev, priv); - priv->thresh_idx =IDX_MIN ; -tango_thermal_init (priv); - - tzdev =devm_thermal_zone_of_sensor_register (&pdev->dev,0 , priv, &ops); -return PTR_ERR_OR_ZERO (tzdev); -} - -static int __maybe_unused tango_thermal_resume (struct device *dev) -{ -tango_thermal_init (dev_get_drvdata (dev)); -return 0 ; -} - -static SIMPLE_DEV_PM_OPS(tango_thermal_pm, NULL, tango_thermal_resume); - -static const struct of_device_id tango_sensor_ids[] = { - { - .compatible ="sigma,smp8758-thermal" , - }, - {/* sentinel */ } -}; -MODULE_DEVICE_TABLE (of, tango_sensor_ids); - -static struct platform_driver tango_thermal_driver = { - .probe = tango_thermal_probe, - .driver = { - .name ="tango-thermal" , - .of_match_table = tango_sensor_ids, - .pm = &tango_thermal_pm, - }, -}; - -module_platform_driver (tango_thermal_driver); - -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Sigma Designs" ); -MODULE_DESCRIPTION ("Tango temperature sensor" );Signature · 1 line
2.29.2
Signature · 6 lines
Måns Rullgård _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
[thermal: thermal/next] thermal/drivers/tango: Remove tango driver
In reply to Arnd BergmannThe following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 8fefe3ce6b7d11a551d98557d5dfc5eba6477409 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//8fefe3ce6b7d11a551d98557d5dfc5eba6477409 Author: Arnd Bergmann <[email protected]> AuthorDate: Wed, 20 Jan 2021 17:23:59 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Wed, 03 Feb 2021 09:16:54 +01:00
thermal/drivers/tango: Remove tango driver
The tango platform is getting removed, so the driver is no longer needed.
--- Documentation/devicetree/bindings/thermal/tango-thermal.txt | 17 +- drivers/thermal/Kconfig | 9 +- drivers/thermal/Makefile | 1 +- drivers/thermal/tango_thermal.c | 126 +------- 4 files changed, 153 deletions(-) delete mode 100644 Documentation/devicetree/bindings/thermal/tango-thermal.txt delete mode 100644 drivers/thermal/tango_thermal.c
Documentation/devicetree/bindings/thermal/tango-thermal.txt deleted +0 -17
@@ -1,17 +0,0 @@ -* Tango Thermal - -The SMP8758 SoC includes 3 instances of this temperature sensor -(in the CPU, video decoder, and PCIe controller). - -Required properties: -- #thermal-sensor-cells: Should be 0 (see Documentation/devicetree/bindings/thermal/thermal-sensor.yaml) -- compatible: "sigma,smp8758-thermal" -- reg: Address range of the thermal registers - -Example: - - cpu_temp: thermal@920100 { - #thermal-sensor-cells = <0>; - compatible = "sigma,smp8758-thermal"; - reg = <0x920100 12>; - };
drivers/thermal/Kconfig +0 -9
@@ -450,15 +450,6 @@ depends on (ARCH_STI || ARCH_STM32) && OF source "drivers/thermal/st/Kconfig" endmenu -config TANGO_THERMAL - tristate "Tango thermal management" - depends on ARCH_TANGO || COMPILE_TEST - help - Enable the Tango thermal driver, which supports the primitive - temperature sensor embedded in Tango chips since the SMP8758. - This sensor only generates a 1-bit signal to indicate whether - the die temperature exceeds a programmable threshold. - source "drivers/thermal/tegra/Kconfig" config GENERIC_ADC_THERMAL
drivers/thermal/Makefile +0 -1
@@ -42,7 +42,6 @@ obj-y += samsung/ obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o -obj-$(CONFIG_TANGO_THERMAL) += tango_thermal.o obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_IMX_SC_THERMAL) += imx_sc_thermal.o obj-$(CONFIG_IMX8MM_THERMAL) += imx8mm_thermal.o
drivers/thermal/tango_thermal.c deleted +0 -126
126 lines not on this page · raw message
PATCH 2/2 thermal: remove zx driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The zte zx platform is getting removed, so this driver is no longer needed.
--- .../bindings/thermal/zx2967-thermal.txt | 116 -------- drivers/thermal/Kconfig | 8 - drivers/thermal/Makefile | 1 - drivers/thermal/zx2967_thermal.c | 256 ------------------ 4 files changed, 381 deletions(-) delete mode 100644 Documentation/devicetree/bindings/thermal/zx2967-thermal.txt delete mode 100644 drivers/thermal/zx2967_thermal.c
Documentation/devicetree/bindings/thermal/zx2967-thermal.txt deleted +0 -116
@@ -1,116 +0,0 @@ -* ZTE zx2967 family Thermal - -Required Properties: -- compatible: should be one of the following. - * zte,zx296718-thermal -- reg: physical base address of the controller and length of memory mapped - region. -- clocks : Pairs of phandle and specifier referencing the controller's clocks. -- clock-names: "topcrm" for the topcrm clock. - "apb" for the apb clock. -- #thermal-sensor-cells: must be 0. - -Please note: slope coefficient defined in thermal-zones section need to be -multiplied by 1000. - -Example for tempsensor: - - tempsensor: tempsensor@148a000 { - compatible = "zte,zx296718-thermal"; - reg = <0x0148a000 0x20>; - clocks = <&topcrm TEMPSENSOR_GATE>, <&audiocrm AUDIO_TS_PCLK>; - clock-names = "topcrm", "apb"; - #thermal-sensor-cells = <0>; - }; - -Example for cooling device: - - cooling_dev: cooling_dev { - cluster0_cooling_dev: cluster0-cooling-dev { - #cooling-cells = <2>; - cpumask = <0xf>; - capacitance = <1500>; - }; - - cluster1_cooling_dev: cluster1-cooling-dev { - #cooling-cells = <2>; - cpumask = <0x30>; - capacitance = <2000>; - }; - }; - -Example for thermal zones: - - thermal-zones { - zx296718_thermal: zx296718_thermal { - polling-delay-passive = <500>; - polling-delay = <1000>; - sustainable-power = <6500>; - - thermal-sensors = <&tempsensor 0>; - /* - * slope need to be multiplied by 1000. - */ - coefficients = <1951 (-922)>; - - trips { - trip0: switch_on_temperature { - temperature = <90000>; - hysteresis = <2000>; - type = "passive"; - }; - - trip1: desired_temperature { - temperature = <100000>; - hysteresis = <2000>; - type = "passive"; - }; - - crit: critical_temperature { - temperature = <110000>; - hysteresis = <2000>; - type = "critical"; - }; - }; - - cooling-maps { - map0 { - trip = <&trip0>; - cooling-device = <&gpu 2 5>; - }; - - map1 { - trip = <&trip0>; - cooling-device = <&cluster0_cooling_dev 1 2>; - }; - - map2 { - trip = <&trip1>; - cooling-device = <&cluster0_cooling_dev 1 2>; - }; - - map3 { - trip = <&crit>; - cooling-device = <&cluster0_cooling_dev 1 2>; - }; - - map4 { - trip = <&trip0>; - cooling-device = <&cluster1_cooling_dev 1 2>; - contribution = <9000>; - }; - - map5 { - trip = <&trip1>; - cooling-device = <&cluster1_cooling_dev 1 2>; - contribution = <4096>; - }; - - map6 { - trip = <&crit>; - cooling-device = <&cluster1_cooling_dev 1 2>; - contribution = <4096>; - }; - }; - }; - };
drivers/thermal/Kconfig +0 -8
@@ -467,14 +467,6 @@ depends on (ARCH_QCOM && OF) || COMPILE_TEST source "drivers/thermal/qcom/Kconfig" endmenu -config ZX2967_THERMAL - tristate "Thermal sensors on zx2967 SoC" - depends on ARCH_ZX || COMPILE_TEST - help - Enable the zx2967 thermal sensors driver, which supports - the primitive temperature sensor embedded in zx2967 SoCs. - This sensor generates the real time die temperature. - config UNIPHIER_THERMAL tristate "Socionext UniPhier thermal driver" depends on ARCH_UNIPHIER || COMPILE_TEST
drivers/thermal/Makefile +0 -1
@@ -56,7 +56,6 @@ obj-y += tegra/ obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o -obj-$(CONFIG_ZX2967_THERMAL) += zx2967_thermal.o obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o obj-$(CONFIG_AMLOGIC_THERMAL) += amlogic_thermal.o obj-$(CONFIG_SPRD_THERMAL) += sprd_thermal.o
drivers/thermal/zx2967_thermal.c deleted +0 -256
256 lines not on this page · raw message
Signature · 1 line
2.29.2
[thermal: thermal/next] thermal/drivers/zx: Remove zx driver
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 73da3f0cca94555d08d62b60ec9b8b9582bc1313 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//73da3f0cca94555d08d62b60ec9b8b9582bc1313 Author: Arnd Bergmann <[email protected]> AuthorDate: Wed, 20 Jan 2021 17:24:00 +01:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Wed, 03 Feb 2021 09:17:47 +01:00
thermal/drivers/zx: Remove zx driver
The zte zx platform is getting removed, so this driver is no longer needed.
--- Documentation/devicetree/bindings/thermal/zx2967-thermal.txt | 116 +--- drivers/thermal/Kconfig | 8 +- drivers/thermal/Makefile | 1 +- drivers/thermal/zx2967_thermal.c | 256 +------- 4 files changed, 381 deletions(-) delete mode 100644 Documentation/devicetree/bindings/thermal/zx2967-thermal.txt delete mode 100644 drivers/thermal/zx2967_thermal.c
Documentation/devicetree/bindings/thermal/zx2967-thermal.txt deleted +0 -116
@@ -1,116 +0,0 @@ -* ZTE zx2967 family Thermal - -Required Properties: -- compatible: should be one of the following. - * zte,zx296718-thermal -- reg: physical base address of the controller and length of memory mapped - region. -- clocks : Pairs of phandle and specifier referencing the controller's clocks. -- clock-names: "topcrm" for the topcrm clock. - "apb" for the apb clock. -- #thermal-sensor-cells: must be 0. - -Please note: slope coefficient defined in thermal-zones section need to be -multiplied by 1000. - -Example for tempsensor: - - tempsensor: tempsensor@148a000 { - compatible = "zte,zx296718-thermal"; - reg = <0x0148a000 0x20>; - clocks = <&topcrm TEMPSENSOR_GATE>, <&audiocrm AUDIO_TS_PCLK>; - clock-names = "topcrm", "apb"; - #thermal-sensor-cells = <0>; - }; - -Example for cooling device: - - cooling_dev: cooling_dev { - cluster0_cooling_dev: cluster0-cooling-dev { - #cooling-cells = <2>; - cpumask = <0xf>; - capacitance = <1500>; - }; - - cluster1_cooling_dev: cluster1-cooling-dev { - #cooling-cells = <2>; - cpumask = <0x30>; - capacitance = <2000>; - }; - }; - -Example for thermal zones: - - thermal-zones { - zx296718_thermal: zx296718_thermal { - polling-delay-passive = <500>; - polling-delay = <1000>; - sustainable-power = <6500>; - - thermal-sensors = <&tempsensor 0>; - /* - * slope need to be multiplied by 1000. - */ - coefficients = <1951 (-922)>; - - trips { - trip0: switch_on_temperature { - temperature = <90000>; - hysteresis = <2000>; - type = "passive"; - }; - - trip1: desired_temperature { - temperature = <100000>; - hysteresis = <2000>; - type = "passive"; - }; - - crit: critical_temperature { - temperature = <110000>; - hysteresis = <2000>; - type = "critical"; - }; - }; - - cooling-maps { - map0 { - trip = <&trip0>; - cooling-device = <&gpu 2 5>; - }; - - map1 { - trip = <&trip0>; - cooling-device = <&cluster0_cooling_dev 1 2>; - }; - - map2 { - trip = <&trip1>; - cooling-device = <&cluster0_cooling_dev 1 2>; - }; - - map3 { - trip = <&crit>; - cooling-device = <&cluster0_cooling_dev 1 2>; - }; - - map4 { - trip = <&trip0>; - cooling-device = <&cluster1_cooling_dev 1 2>; - contribution = <9000>; - }; - - map5 { - trip = <&trip1>; - cooling-device = <&cluster1_cooling_dev 1 2>; - contribution = <4096>; - }; - - map6 { - trip = <&crit>; - cooling-device = <&cluster1_cooling_dev 1 2>; - contribution = <4096>; - }; - }; - }; - };
drivers/thermal/Kconfig +0 -8
@@ -467,14 +467,6 @@ depends on (ARCH_QCOM && OF) || COMPILE_TEST source "drivers/thermal/qcom/Kconfig" endmenu -config ZX2967_THERMAL - tristate "Thermal sensors on zx2967 SoC" - depends on ARCH_ZX || COMPILE_TEST - help - Enable the zx2967 thermal sensors driver, which supports - the primitive temperature sensor embedded in zx2967 SoCs. - This sensor generates the real time die temperature. - config UNIPHIER_THERMAL tristate "Socionext UniPhier thermal driver" depends on ARCH_UNIPHIER || COMPILE_TEST
drivers/thermal/Makefile +0 -1
@@ -56,7 +56,6 @@ obj-y += tegra/ obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o -obj-$(CONFIG_ZX2967_THERMAL) += zx2967_thermal.o obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o obj-$(CONFIG_AMLOGIC_THERMAL) += amlogic_thermal.o obj-$(CONFIG_SPRD_THERMAL) += sprd_thermal.o
drivers/thermal/zx2967_thermal.c deleted +0 -256
256 lines not on this page · raw message