| Message ID | 20191030182132.25763-7-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Eduardo Valentin |
| Headers | show |
| Series | brcmstb_thermal updates for new processes | expand |
On Wed, Oct 30, 2019 at 11:52 PM Florian Fainelli <f.fainelli@gmail.com> wrote: > > Since we do not have interrupts on BCM7216, we cannot have trip point > crossing, the thermal subsystem expects us to provide a NULL set_trips > operation in that case, so make it possible to provide per-process > thermal_zone_of_device_ops > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> > --- > drivers/thermal/broadcom/brcmstb_thermal.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c > index 64f715053ce9..a75a335d1bb3 100644 > --- a/drivers/thermal/broadcom/brcmstb_thermal.c > +++ b/drivers/thermal/broadcom/brcmstb_thermal.c > @@ -96,6 +96,7 @@ static struct avs_tmon_trip avs_tmon_trips[] = { > struct brcmstb_thermal_params { > unsigned int offset; > unsigned int mult; > + const struct thermal_zone_of_device_ops *of_ops; > }; > > struct brcmstb_thermal_priv { > @@ -278,19 +279,25 @@ static int brcmstb_set_trips(void *data, int low, int high) > return 0; > } > > -static const struct thermal_zone_of_device_ops of_ops = { > +static const struct thermal_zone_of_device_ops brcmstb_16nm_of_ops = { > .get_temp = brcmstb_get_temp, > - .set_trips = brcmstb_set_trips, > }; > > static const struct brcmstb_thermal_params brcmstb_16nm_params = { > .offset = 457829, > .mult = 557, > + .of_ops = &brcmstb_16nm_of_ops, > +}; > + > +static const struct thermal_zone_of_device_ops brcmstb_28nm_of_ops = { > + .get_temp = brcmstb_get_temp, > + .set_trips = brcmstb_set_trips, > }; > > static const struct brcmstb_thermal_params brcmstb_28nm_params = { > .offset = 410040, > .mult = 487, > + .of_ops = &brcmstb_28nm_of_ops, > }; > > static const struct of_device_id brcmstb_thermal_id_table[] = { > @@ -329,7 +336,7 @@ static int brcmstb_thermal_probe(struct platform_device *pdev) > platform_set_drvdata(pdev, priv); > > thermal = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, priv, > - &of_ops); > + priv->temp_params.of_ops); > if (IS_ERR(thermal)) { > ret = PTR_ERR(thermal); > dev_err(&pdev->dev, "could not register sensor: %d\n", ret); > -- > 2.17.1 >
diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c index 64f715053ce9..a75a335d1bb3 100644 --- a/drivers/thermal/broadcom/brcmstb_thermal.c +++ b/drivers/thermal/broadcom/brcmstb_thermal.c @@ -96,6 +96,7 @@ static struct avs_tmon_trip avs_tmon_trips[] = { struct brcmstb_thermal_params { unsigned int offset; unsigned int mult; + const struct thermal_zone_of_device_ops *of_ops; }; struct brcmstb_thermal_priv { @@ -278,19 +279,25 @@ static int brcmstb_set_trips(void *data, int low, int high) return 0; } -static const struct thermal_zone_of_device_ops of_ops = { +static const struct thermal_zone_of_device_ops brcmstb_16nm_of_ops = { .get_temp = brcmstb_get_temp, - .set_trips = brcmstb_set_trips, }; static const struct brcmstb_thermal_params brcmstb_16nm_params = { .offset = 457829, .mult = 557, + .of_ops = &brcmstb_16nm_of_ops, +}; + +static const struct thermal_zone_of_device_ops brcmstb_28nm_of_ops = { + .get_temp = brcmstb_get_temp, + .set_trips = brcmstb_set_trips, }; static const struct brcmstb_thermal_params brcmstb_28nm_params = { .offset = 410040, .mult = 487, + .of_ops = &brcmstb_28nm_of_ops, }; static const struct of_device_id brcmstb_thermal_id_table[] = { @@ -329,7 +336,7 @@ static int brcmstb_thermal_probe(struct platform_device *pdev) platform_set_drvdata(pdev, priv); thermal = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, priv, - &of_ops); + priv->temp_params.of_ops); if (IS_ERR(thermal)) { ret = PTR_ERR(thermal); dev_err(&pdev->dev, "could not register sensor: %d\n", ret);
Since we do not have interrupts on BCM7216, we cannot have trip point crossing, the thermal subsystem expects us to provide a NULL set_trips operation in that case, so make it possible to provide per-process thermal_zone_of_device_ops Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/thermal/broadcom/brcmstb_thermal.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)