Re: [PATCH 1/2] thermal: remove tango driver
Arnd Bergmann writes:
> From: Arnd Bergmann
>
> The tango platform is getting removed, so the driver is no
> longer needed.
>
> Cc: Marc Gonzalez
> Cc: Mans Rullgard
> Signed-off-by: Arnd Bergmann
Acked-by: Mans Rullgard
> ---
> .../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
>
> diff --git a/Documentation/devicetree/bindings/thermal/tango-thermal.txt
> b/Documentation/devicetree/bindings/thermal/tango-thermal.txt
> deleted file mode 100644
> index 2c918d742867..
> --- a/Documentation/devicetree/bindings/thermal/tango-thermal.txt
> +++ /dev/null
> @@ -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>;
> - };
>
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 7edc8dc6bbab..cf199574c096 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -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
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index b64dd50a6629..a44dda2d03bc 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -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
> diff --git a/drivers/thermal/tango_thermal.c b/drivers/thermal/tango_thermal.c
> deleted file mode 100644
> index 304b461e12aa..
> --- a/drivers/thermal/tango_thermal.c
> +++ /dev/null
> @@ -1,126 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -#include
> -#include
> -#include
> -#include
> -#include
> -
> -/*
> - * 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();
> - }
> -
> - *
[PATCH 1/2] thermal: remove tango driver
From: Arnd Bergmann
The tango platform is getting removed, so the driver is no
longer needed.
Cc: Marc Gonzalez
Cc: Mans Rullgard
Signed-off-by: Arnd Bergmann
---
.../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
diff --git a/Documentation/devicetree/bindings/thermal/tango-thermal.txt
b/Documentation/devicetree/bindings/thermal/tango-thermal.txt
deleted file mode 100644
index 2c918d742867..
--- a/Documentation/devicetree/bindings/thermal/tango-thermal.txt
+++ /dev/null
@@ -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>;
- };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 7edc8dc6bbab..cf199574c096 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -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
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index b64dd50a6629..a44dda2d03bc 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -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
diff --git a/drivers/thermal/tango_thermal.c b/drivers/thermal/tango_thermal.c
deleted file mode 100644
index 304b461e12aa..
--- a/drivers/thermal/tango_thermal.c
+++ /dev/null
@@ -1,126 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-#include
-#include
-#include
-#include
-#include
-
-/*
- * 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_OFF0
-#define CMD_ON 1
-#define CMD_READ 2
-
-#define IDX_MIN15
-#define IDX_MAX40
-
-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_i
