Commit 90b2ca02 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Daniel Lezcano
Browse files

thermal/drivers/rockchip: 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-4-daniel.lezcano@linexp.org


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 48ad3b10

drivers/thermal/rockchip_thermal.c

+7 −7
Original line number Diff line number Diff line
@@ -1211,9 +1211,9 @@ static irqreturn_t rockchip_thermal_alarm_irq_thread(int irq, void *dev) 
	return IRQ_HANDLED;

}



static int rockchip_thermal_set_trips(void *_sensor, int low, int high)

static int rockchip_thermal_set_trips(struct thermal_zone_device *tz, int low, int high)

{

	struct rockchip_thermal_sensor *sensor = _sensor;

	struct rockchip_thermal_sensor *sensor = tz->devdata;

	struct rockchip_thermal_data *thermal = sensor->thermal;

	const struct rockchip_tsadc_chip *tsadc = thermal->chip;
@@ -1224,9 +1224,9 @@ static int rockchip_thermal_set_trips(void *_sensor, int low, int high) 
				     sensor->id, thermal->regs, high);

}



static int rockchip_thermal_get_temp(void *_sensor, int *out_temp)

static int rockchip_thermal_get_temp(struct thermal_zone_device *tz, int *out_temp)

{

	struct rockchip_thermal_sensor *sensor = _sensor;

	struct rockchip_thermal_sensor *sensor = tz->devdata;

	struct rockchip_thermal_data *thermal = sensor->thermal;

	const struct rockchip_tsadc_chip *tsadc = sensor->thermal->chip;

	int retval;
@@ -1239,7 +1239,7 @@ static int rockchip_thermal_get_temp(void *_sensor, int *out_temp) 
	return retval;

}



static const struct thermal_zone_of_device_ops rockchip_of_thermal_ops = {

static const struct thermal_zone_device_ops rockchip_of_thermal_ops = {

	.get_temp = rockchip_thermal_get_temp,

	.set_trips = rockchip_thermal_set_trips,

};
@@ -1326,8 +1326,8 @@ rockchip_thermal_register_sensor(struct platform_device *pdev, 


	sensor->thermal = thermal;

	sensor->id = id;

	sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id,

					sensor, &rockchip_of_thermal_ops);

	sensor->tzd = devm_thermal_of_zone_register(&pdev->dev, id, sensor,

						    &rockchip_of_thermal_ops);

	if (IS_ERR(sensor->tzd)) {

		error = PTR_ERR(sensor->tzd);

		dev_err(&pdev->dev, "failed to register sensor %d: %d\n",