Skip to content

L
linux
Commit 6828e402 authored by Alain Volmat's avatar Alain Volmat Committed by Rafael J. Wysocki
Browse files
Options

thermal/drivers/st: Remove syscfg based driver 

The syscfg based thermal driver is only supporting STiH415 STiH416 and
STiD127 platforms which are all no more supported.  We can thus safely
remove this driver since the remaining STi platform STiH407/STiH410
and STiH418 are all using the memmap based thermal driver.
Signed-off-by: default avatarAlain Volmat <avolmat@me.com>
Link: https://lore.kernel.org/r/20230209091659.1409-7-avolmat@me.comSigned-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9272d2d4
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 179 deletions
drivers/thermal/st/Kconfig
View file @ 6828e402
...@@ -8,10 +8,6 @@ config ST_THERMAL ...@@ -8,10 +8,6 @@ config ST_THERMAL
help help
Support for thermal sensors on STMicroelectronics STi series of SoCs. Support for thermal sensors on STMicroelectronics STi series of SoCs.
config ST_THERMAL_SYSCFG
select ST_THERMAL
tristate "STi series syscfg register access based thermal sensors"
config ST_THERMAL_MEMMAP config ST_THERMAL_MEMMAP
select ST_THERMAL select ST_THERMAL
tristate "STi series memory mapped access based thermal sensors" tristate "STi series memory mapped access based thermal sensors"
......
drivers/thermal/st/Makefile
View file @ 6828e402
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_ST_THERMAL) := st_thermal.o obj-$(CONFIG_ST_THERMAL) := st_thermal.o
obj-$(CONFIG_ST_THERMAL_SYSCFG) += st_thermal_syscfg.o
obj-$(CONFIG_ST_THERMAL_MEMMAP) += st_thermal_memmap.o obj-$(CONFIG_ST_THERMAL_MEMMAP) += st_thermal_memmap.o
obj-$(CONFIG_STM32_THERMAL) += stm_thermal.o obj-$(CONFIG_STM32_THERMAL) += stm_thermal.o
drivers/thermal/st/st_thermal_syscfg.c deleted 100644 → 0
View file @ 9272d2d4
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* ST Thermal Sensor Driver for syscfg based sensors.
* Author: Ajit Pal Singh <ajitpal.singh@st.com>
*
* Copyright (C) 2003-2014 STMicroelectronics (R&D) Limited
*/
#include <linux/of.h>
#include <linux/module.h>
#include <linux/mfd/syscon.h>
#include "st_thermal.h"
/* STiH415 */
#define STIH415_SYSCFG_FRONT(num) ((num - 100) * 4)
#define STIH415_SAS_THSENS_CONF STIH415_SYSCFG_FRONT(178)
#define STIH415_SAS_THSENS_STATUS STIH415_SYSCFG_FRONT(198)
#define STIH415_SYSCFG_MPE(num) ((num - 600) * 4)
#define STIH415_MPE_THSENS_CONF STIH415_SYSCFG_MPE(607)
#define STIH415_MPE_THSENS_STATUS STIH415_SYSCFG_MPE(667)
/* STiH416 */
#define STIH416_SYSCFG_FRONT(num) ((num - 1000) * 4)
#define STIH416_SAS_THSENS_CONF STIH416_SYSCFG_FRONT(1552)
#define STIH416_SAS_THSENS_STATUS1 STIH416_SYSCFG_FRONT(1554)
#define STIH416_SAS_THSENS_STATUS2 STIH416_SYSCFG_FRONT(1594)
/* STiD127 */
#define STID127_SYSCFG_CPU(num) ((num - 700) * 4)
#define STID127_THSENS_CONF STID127_SYSCFG_CPU(743)
#define STID127_THSENS_STATUS STID127_SYSCFG_CPU(767)
static const struct reg_field st_415sas_regfields[MAX_REGFIELDS] = {
[TEMP_PWR] = REG_FIELD(STIH415_SAS_THSENS_CONF, 9, 9),
[DCORRECT] = REG_FIELD(STIH415_SAS_THSENS_CONF, 4, 8),
[OVERFLOW] = REG_FIELD(STIH415_SAS_THSENS_STATUS, 8, 8),
[DATA] = REG_FIELD(STIH415_SAS_THSENS_STATUS, 10, 16),
};
static const struct reg_field st_415mpe_regfields[MAX_REGFIELDS] = {
[TEMP_PWR] = REG_FIELD(STIH415_MPE_THSENS_CONF, 8, 8),
[DCORRECT] = REG_FIELD(STIH415_MPE_THSENS_CONF, 3, 7),
[OVERFLOW] = REG_FIELD(STIH415_MPE_THSENS_STATUS, 9, 9),
[DATA] = REG_FIELD(STIH415_MPE_THSENS_STATUS, 11, 18),
};
static const struct reg_field st_416sas_regfields[MAX_REGFIELDS] = {
[TEMP_PWR] = REG_FIELD(STIH416_SAS_THSENS_CONF, 9, 9),
[DCORRECT] = REG_FIELD(STIH416_SAS_THSENS_CONF, 4, 8),
[OVERFLOW] = REG_FIELD(STIH416_SAS_THSENS_STATUS1, 8, 8),
[DATA] = REG_FIELD(STIH416_SAS_THSENS_STATUS2, 10, 16),
};
static const struct reg_field st_127_regfields[MAX_REGFIELDS] = {
[TEMP_PWR] = REG_FIELD(STID127_THSENS_CONF, 7, 7),
[DCORRECT] = REG_FIELD(STID127_THSENS_CONF, 2, 6),
[OVERFLOW] = REG_FIELD(STID127_THSENS_STATUS, 9, 9),
[DATA] = REG_FIELD(STID127_THSENS_STATUS, 11, 18),
};
/* Private OPs for System Configuration Register based thermal sensors */
static int st_syscfg_power_ctrl(struct st_thermal_sensor *sensor,
enum st_thermal_power_state power_state)
{
return regmap_field_write(sensor->pwr, power_state);
}
static int st_syscfg_alloc_regfields(struct st_thermal_sensor *sensor)
{
struct device *dev = sensor->dev;
sensor->pwr = devm_regmap_field_alloc(dev, sensor->regmap,
sensor->cdata->reg_fields[TEMP_PWR]);
if (IS_ERR(sensor->pwr)) {
dev_err(dev, "failed to alloc syscfg regfields\n");
return PTR_ERR(sensor->pwr);
}
return 0;
}
static int st_syscfg_regmap_init(struct st_thermal_sensor *sensor)
{
sensor->regmap =
syscon_regmap_lookup_by_compatible(sensor->cdata->sys_compat);
if (IS_ERR(sensor->regmap)) {
dev_err(sensor->dev, "failed to find syscfg regmap\n");
return PTR_ERR(sensor->regmap);
}
return 0;
}
static const struct st_thermal_sensor_ops st_syscfg_sensor_ops = {
.power_ctrl = st_syscfg_power_ctrl,
.alloc_regfields = st_syscfg_alloc_regfields,
.regmap_init = st_syscfg_regmap_init,
};
/* Compatible device data for stih415 sas thermal sensor */
static const struct st_thermal_compat_data st_415sas_cdata = {
.sys_compat = "st,stih415-front-syscfg",
.reg_fields = st_415sas_regfields,
.ops = &st_syscfg_sensor_ops,
.calibration_val = 16,
.temp_adjust_val = 20,
.crit_temp = 120,
};
/* Compatible device data for stih415 mpe thermal sensor */
static const struct st_thermal_compat_data st_415mpe_cdata = {
.sys_compat = "st,stih415-system-syscfg",
.reg_fields = st_415mpe_regfields,
.ops = &st_syscfg_sensor_ops,
.calibration_val = 16,
.temp_adjust_val = -103,
.crit_temp = 120,
};
/* Compatible device data for stih416 sas thermal sensor */
static const struct st_thermal_compat_data st_416sas_cdata = {
.sys_compat = "st,stih416-front-syscfg",
.reg_fields = st_416sas_regfields,
.ops = &st_syscfg_sensor_ops,
.calibration_val = 16,
.temp_adjust_val = 20,
.crit_temp = 120,
};
/* Compatible device data for stid127 thermal sensor */
static const struct st_thermal_compat_data st_127_cdata = {
.sys_compat = "st,stid127-cpu-syscfg",
.reg_fields = st_127_regfields,
.ops = &st_syscfg_sensor_ops,
.calibration_val = 8,
.temp_adjust_val = -103,
.crit_temp = 120,
};
static const struct of_device_id st_syscfg_thermal_of_match[] = {
{ .compatible = "st,stih415-sas-thermal", .data = &st_415sas_cdata },
{ .compatible = "st,stih415-mpe-thermal", .data = &st_415mpe_cdata },
{ .compatible = "st,stih416-sas-thermal", .data = &st_416sas_cdata },
{ .compatible = "st,stid127-thermal", .data = &st_127_cdata },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, st_syscfg_thermal_of_match);
static int st_syscfg_probe(struct platform_device *pdev)
{
return st_thermal_register(pdev, st_syscfg_thermal_of_match);
}
static int st_syscfg_remove(struct platform_device *pdev)
{
return st_thermal_unregister(pdev);
}
static struct platform_driver st_syscfg_thermal_driver = {
.driver = {
.name = "st_syscfg_thermal",
.pm = &st_thermal_pm_ops,
.of_match_table = st_syscfg_thermal_of_match,
},
.probe = st_syscfg_probe,
.remove = st_syscfg_remove,
};
module_platform_driver(st_syscfg_thermal_driver);
MODULE_AUTHOR("STMicroelectronics (R&D) Limited <ajitpal.singh@st.com>");
MODULE_DESCRIPTION("STMicroelectronics STi SoC Thermal Sensor Driver");
MODULE_LICENSE("GPL v2");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7