Commit 1240fd65 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Daniel Lezcano

thermal/drivers/amlogic: Switch to new of API

The thermal OF code has a new API allowing to migrate the OF
initialization to a simpler approach. The ops are no longer device
tree specific and are the generic ones provided by the core code.

Convert the ops to the thermal_zone_device_ops format and use the new
API to register the thermal zone with these generic ops.
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linexp.org>
Link: https://lore.kernel.org/r/20220804224349.1926752-14-daniel.lezcano@linexp.orgReviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 7e96f354
...@@ -179,12 +179,12 @@ static int amlogic_thermal_disable(struct amlogic_thermal *data) ...@@ -179,12 +179,12 @@ static int amlogic_thermal_disable(struct amlogic_thermal *data)
return 0; return 0;
} }
static int amlogic_thermal_get_temp(void *data, int *temp) static int amlogic_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
{ {
unsigned int tval; unsigned int tval;
struct amlogic_thermal *pdata = data; struct amlogic_thermal *pdata = tz->devdata;
if (!data) if (!pdata)
return -EINVAL; return -EINVAL;
regmap_read(pdata->regmap, TSENSOR_STAT0, &tval); regmap_read(pdata->regmap, TSENSOR_STAT0, &tval);
...@@ -195,7 +195,7 @@ static int amlogic_thermal_get_temp(void *data, int *temp) ...@@ -195,7 +195,7 @@ static int amlogic_thermal_get_temp(void *data, int *temp)
return 0; return 0;
} }
static const struct thermal_zone_of_device_ops amlogic_thermal_ops = { static const struct thermal_zone_device_ops amlogic_thermal_ops = {
.get_temp = amlogic_thermal_get_temp, .get_temp = amlogic_thermal_get_temp,
}; };
...@@ -276,10 +276,10 @@ static int amlogic_thermal_probe(struct platform_device *pdev) ...@@ -276,10 +276,10 @@ static int amlogic_thermal_probe(struct platform_device *pdev)
return PTR_ERR(pdata->sec_ao_map); return PTR_ERR(pdata->sec_ao_map);
} }
pdata->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, pdata->tzd = devm_thermal_of_zone_register(&pdev->dev,
0, 0,
pdata, pdata,
&amlogic_thermal_ops); &amlogic_thermal_ops);
if (IS_ERR(pdata->tzd)) { if (IS_ERR(pdata->tzd)) {
ret = PTR_ERR(pdata->tzd); ret = PTR_ERR(pdata->tzd);
dev_err(dev, "Failed to register tsensor: %d\n", ret); dev_err(dev, "Failed to register tsensor: %d\n", ret);
......
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