Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermal/drivers/loongson2: Add Loongson-2K2000 support

Browse Source 
The Loongson-2K2000 and Loongson-2K1000 have similar thermal sensors,
except that the temperature is read differently.

In particular, the temperature output registers of the Loongson-2K2000
are defined in the chip configuration domain and are read in a different
way.

Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
Acked-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/fdbfdcc3231a36a4ee0bcf1377ddcbd6f8c944b5.1713837379.git.zhoubinbin@loongson.cn
This commit is contained in:
Binbin Zhou 2024-04-23 09:59:26 +08:00 committed by Daniel Lezcano
parent c8c4353685
commit 734b5def91
1 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/thermal/loongson2_thermal.c
View File

@ -30,12 +30,20 @@
LOONGSON2_THSENS_INT_HIGH) LOONGSON2_THSENS_INT_HIGH)
#define LOONGSON2_THSENS_OUT_MASK 0xFF #define LOONGSON2_THSENS_OUT_MASK 0xFF
/*
* This flag is used to indicate the temperature reading
* method of the Loongson-2K2000
*/
#define LS2K2000_THSENS_OUT_FLAG BIT(0)
struct loongson2_thermal_chip_data { struct loongson2_thermal_chip_data {
unsigned int thermal_sensor_sel; unsigned int thermal_sensor_sel;
unsigned int flags;
}; };
struct loongson2_thermal_data { struct loongson2_thermal_data {
void __iomem *regs; void __iomem *ctrl_reg;
void __iomem *temp_reg;
const struct loongson2_thermal_chip_data *chip_data; const struct loongson2_thermal_chip_data *chip_data;
}; };
@ -48,7 +56,7 @@ static void loongson2_set_ctrl_regs(struct loongson2_thermal_data *data,
reg_ctrl = ctrl_data + HECTO; reg_ctrl = ctrl_data + HECTO;
reg_ctrl |= enable ? 0x100 : 0; reg_ctrl |= enable ? 0x100 : 0;
writew(reg_ctrl, data->regs + ctrl_reg + reg_off); writew(reg_ctrl, data->ctrl_reg + ctrl_reg + reg_off);
} }
static int loongson2_thermal_set(struct loongson2_thermal_data *data, static int loongson2_thermal_set(struct loongson2_thermal_data *data,
@ -63,13 +71,24 @@ static int loongson2_thermal_set(struct loongson2_thermal_data *data,
return 0; return 0;
} }
static int loongson2_thermal_get_temp(struct thermal_zone_device *tz, int *temp) static int loongson2_2k1000_get_temp(struct thermal_zone_device *tz, int *temp)
{ {
u32 reg_val; int val;
struct loongson2_thermal_data *data = thermal_zone_device_priv(tz); struct loongson2_thermal_data *data = thermal_zone_device_priv(tz);
reg_val = readl(data->regs + LOONGSON2_THSENS_OUT_REG); val = readl(data->ctrl_reg + LOONGSON2_THSENS_OUT_REG);
*temp = ((reg_val & LOONGSON2_THSENS_OUT_MASK) - HECTO) * KILO; *temp = ((val & LOONGSON2_THSENS_OUT_MASK) - HECTO) * KILO;
return 0;
}
static int loongson2_2k2000_get_temp(struct thermal_zone_device *tz, int *temp)
{
int val;
struct loongson2_thermal_data *data = thermal_zone_device_priv(tz);
val = readl(data->temp_reg);
*temp = ((val & 0xffff) * 820 / 0x4000 - 311) * KILO;
return 0; return 0;
} }
@ -79,7 +98,7 @@ static irqreturn_t loongson2_thermal_irq_thread(int irq, void *dev)
struct thermal_zone_device *tzd = dev; struct thermal_zone_device *tzd = dev;
struct loongson2_thermal_data *data = thermal_zone_device_priv(tzd); struct loongson2_thermal_data *data = thermal_zone_device_priv(tzd);
writeb(LOONGSON2_THSENS_INT_EN, data->regs + LOONGSON2_THSENS_STATUS_REG); writeb(LOONGSON2_THSENS_INT_EN, data->ctrl_reg + LOONGSON2_THSENS_STATUS_REG);
thermal_zone_device_update(tzd, THERMAL_EVENT_UNSPECIFIED); thermal_zone_device_update(tzd, THERMAL_EVENT_UNSPECIFIED);
@ -93,8 +112,8 @@ static int loongson2_thermal_set_trips(struct thermal_zone_device *tz, int low,
return loongson2_thermal_set(data, low/MILLI, high/MILLI, true); return loongson2_thermal_set(data, low/MILLI, high/MILLI, true);
} }
static const struct thermal_zone_device_ops loongson2_of_thermal_ops = { static struct thermal_zone_device_ops loongson2_of_thermal_ops = {
.get_temp = loongson2_thermal_get_temp, .get_temp = loongson2_2k1000_get_temp,
.set_trips = loongson2_thermal_set_trips, .set_trips = loongson2_thermal_set_trips,
}; };
@ -111,15 +130,24 @@ static int loongson2_thermal_probe(struct platform_device *pdev)
data->chip_data = device_get_match_data(dev); data->chip_data = device_get_match_data(dev);
data->regs = devm_platform_ioremap_resource(pdev, 0); data->ctrl_reg = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(data->regs)) if (IS_ERR(data->ctrl_reg))
return PTR_ERR(data->regs); return PTR_ERR(data->ctrl_reg);
/* The temperature output register is separate for Loongson-2K2000 */
if (data->chip_data->flags & LS2K2000_THSENS_OUT_FLAG) {
data->temp_reg = devm_platform_ioremap_resource(pdev, 1);
if (IS_ERR(data->temp_reg))
return PTR_ERR(data->temp_reg);
loongson2_of_thermal_ops.get_temp = loongson2_2k2000_get_temp;
}
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) if (irq < 0)
return irq; return irq;
writeb(LOONGSON2_THSENS_INT_EN, data->regs + LOONGSON2_THSENS_STATUS_REG); writeb(LOONGSON2_THSENS_INT_EN, data->ctrl_reg + LOONGSON2_THSENS_STATUS_REG);
loongson2_thermal_set(data, 0, 0, false); loongson2_thermal_set(data, 0, 0, false);
@ -148,6 +176,12 @@ static int loongson2_thermal_probe(struct platform_device *pdev)
static const struct loongson2_thermal_chip_data loongson2_thermal_ls2k1000_data = { static const struct loongson2_thermal_chip_data loongson2_thermal_ls2k1000_data = {
.thermal_sensor_sel = 0, .thermal_sensor_sel = 0,
.flags = 0,
};
static const struct loongson2_thermal_chip_data loongson2_thermal_ls2k2000_data = {
.thermal_sensor_sel = 0,
.flags = LS2K2000_THSENS_OUT_FLAG,
}; };
static const struct of_device_id of_loongson2_thermal_match[] = { static const struct of_device_id of_loongson2_thermal_match[] = {
@ -155,6 +189,10 @@ static const struct of_device_id of_loongson2_thermal_match[] = {
.compatible = "loongson,ls2k1000-thermal", .compatible = "loongson,ls2k1000-thermal",
.data = &loongson2_thermal_ls2k1000_data, .data = &loongson2_thermal_ls2k1000_data,
}, },
{
.compatible = "loongson,ls2k2000-thermal",
.data = &loongson2_thermal_ls2k2000_data,
},
{ /* end */ } { /* end */ }
}; };
MODULE_DEVICE_TABLE(of, of_loongson2_thermal_match); MODULE_DEVICE_TABLE(of, of_loongson2_thermal_match);