| Message ID | 87y4dagb0i.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Simon Horman |
| Headers | show |
Hi > +static int rcar_thermal_of_get_temp(void *data, int *temp) > +{ > + struct rcar_thermal_priv *priv = data; > + > + *temp = rcar_thermal_get_current_temp(priv); > + > + return 0; > +} > + > +static int rcar_thermal_get_temp(struct thermal_zone_device *zone, int *temp) > +{ > + struct rcar_thermal_priv *priv = rcar_zone_to_priv(zone); > + > + *temp = rcar_thermal_get_current_temp(priv); > + > return 0; > } > Above two function, always returns 0. Can it possible to handle error and log some messages. Regards Manish Badarkhe -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Manish > > +static int rcar_thermal_of_get_temp(void *data, int *temp) > > +{ > > + struct rcar_thermal_priv *priv = data; > > + > > + *temp = rcar_thermal_get_current_temp(priv); > > + > > + return 0; > > +} > > + > > +static int rcar_thermal_get_temp(struct thermal_zone_device *zone, int *temp) > > +{ > > + struct rcar_thermal_priv *priv = rcar_zone_to_priv(zone); > > + > > + *temp = rcar_thermal_get_current_temp(priv); > > + > > return 0; > > } > > > > Above two function, always returns 0. Can it possible to handle error > and log some messages. Thanks. Will try in v2 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Morimoto-san, CC devicetree On Fri, Dec 4, 2015 at 4:17 AM, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > This patch enables to use thermal-zone on DT if it was call as > "renesas,rcar-thermal-gen2". > Previous style is still supported by "renesas,rcar-thermal". > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > .../devicetree/bindings/thermal/rcar-thermal.txt | 37 +++++++++++++++++- > drivers/thermal/rcar_thermal.c | 45 +++++++++++++++++++--- > 2 files changed, 74 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt > index 332e625..904f204 100644 > --- a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt > +++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt > @@ -1,8 +1,9 @@ > * Renesas R-Car Thermal > > Required properties: > -- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal" > - as fallback. > +- compatible : "renesas,thermal-<soctype>", > + "renesas,rcar-thermal-gen2" (with thermal-zone) or Ugh, another different scheme "<manuf>,<family>-<device>-<familyversion>"... What about "renesas,rcar-gen2-thermal"? > + "renesas,rcar-thermal" (without thermal-zone) as fallback. > Examples with soctypes are: > - "renesas,thermal-r8a73a4" (R-Mobile APE6) > - "renesas,thermal-r8a7779" (R-Car H1) > @@ -36,3 +37,35 @@ thermal@e61f0000 { > 0xe61f0300 0x38>; > interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>; > }; > + > +Example (with thermal-zone): > + > +thermal-zones { > + cpu_thermal: cpu-thermal { > + polling-delay-passive = <1000>; > + polling-delay = <5000>; > + > + thermal-sensors = <&thermal>; > + > + trips { > + cpu-crit { > + temperature = <1150000>; > + hysteresis = <0>; > + type = "critical"; > + }; > + }; > + cooling-maps { > + }; > + }; > +}; > + > +thermal: thermal@e61f0000 { > + compatible = "renesas,thermal-r8a7790", > + "renesas,rcar-thermal-gen2", > + "renesas,rcar-thermal"; > + reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>; > + interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&mstp5_clks R8A7790_CLK_THERMAL>; > + power-domains = <&cpg_clocks>; > + #thermal-sensor-cells = <0>; > +}; How are the two nodes above linked? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Dec 4, 2015 at 9:32 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: >> +Example (with thermal-zone): >> + >> +thermal-zones { >> + cpu_thermal: cpu-thermal { >> + polling-delay-passive = <1000>; >> + polling-delay = <5000>; >> + >> + thermal-sensors = <&thermal>; >> + >> + trips { >> + cpu-crit { >> + temperature = <1150000>; >> + hysteresis = <0>; >> + type = "critical"; >> + }; >> + }; >> + cooling-maps { >> + }; >> + }; >> +}; >> + >> +thermal: thermal@e61f0000 { >> + compatible = "renesas,thermal-r8a7790", >> + "renesas,rcar-thermal-gen2", >> + "renesas,rcar-thermal"; >> + reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>; >> + interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&mstp5_clks R8A7790_CLK_THERMAL>; >> + power-domains = <&cpg_clocks>; >> + #thermal-sensor-cells = <0>; >> +}; > > How are the two nodes above linked? Pleae ignore my comment, I found the "<&thermal>". Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt index 332e625..904f204 100644 --- a/Documentation/devicetree/bindings/thermal/rcar-thermal.txt +++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.txt @@ -1,8 +1,9 @@ * Renesas R-Car Thermal Required properties: -- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal" - as fallback. +- compatible : "renesas,thermal-<soctype>", + "renesas,rcar-thermal-gen2" (with thermal-zone) or + "renesas,rcar-thermal" (without thermal-zone) as fallback. Examples with soctypes are: - "renesas,thermal-r8a73a4" (R-Mobile APE6) - "renesas,thermal-r8a7779" (R-Car H1) @@ -36,3 +37,35 @@ thermal@e61f0000 { 0xe61f0300 0x38>; interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>; }; + +Example (with thermal-zone): + +thermal-zones { + cpu_thermal: cpu-thermal { + polling-delay-passive = <1000>; + polling-delay = <5000>; + + thermal-sensors = <&thermal>; + + trips { + cpu-crit { + temperature = <1150000>; + hysteresis = <0>; + type = "critical"; + }; + }; + cooling-maps { + }; + }; +}; + +thermal: thermal@e61f0000 { + compatible = "renesas,thermal-r8a7790", + "renesas,rcar-thermal-gen2", + "renesas,rcar-thermal"; + reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>; + interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp5_clks R8A7790_CLK_THERMAL>; + power-domains = <&cpg_clocks>; + #thermal-sensor-cells = <0>; +}; diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index 96707a6..9c9e38b 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c @@ -23,6 +23,7 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/module.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/reboot.h> @@ -81,8 +82,10 @@ struct rcar_thermal_priv { # define rcar_force_update_temp(priv) 0 #endif +#define USE_OF_THERMAL 1 static const struct of_device_id rcar_thermal_dt_ids[] = { { .compatible = "renesas,rcar-thermal", }, + { .compatible = "renesas,rcar-thermal-gen2", .data = (void *)USE_OF_THERMAL }, {}, }; MODULE_DEVICE_TABLE(of, rcar_thermal_dt_ids); @@ -206,17 +209,35 @@ err_out_unlock: return ret; } -static int rcar_thermal_get_temp(struct thermal_zone_device *zone, int *temp) +static int rcar_thermal_get_current_temp(struct rcar_thermal_priv *priv) { - struct rcar_thermal_priv *priv = rcar_zone_to_priv(zone); + int temp; if (!rcar_has_irq_support(priv) || rcar_force_update_temp(priv)) rcar_thermal_update_temp(priv); mutex_lock(&priv->lock); - *temp = MCELSIUS((priv->ctemp * 5) - 65); + temp = MCELSIUS((priv->ctemp * 5) - 65); mutex_unlock(&priv->lock); + return temp; +} + +static int rcar_thermal_of_get_temp(void *data, int *temp) +{ + struct rcar_thermal_priv *priv = data; + + *temp = rcar_thermal_get_current_temp(priv); + + return 0; +} + +static int rcar_thermal_get_temp(struct thermal_zone_device *zone, int *temp) +{ + struct rcar_thermal_priv *priv = rcar_zone_to_priv(zone); + + *temp = rcar_thermal_get_current_temp(priv); + return 0; } @@ -276,6 +297,10 @@ static int rcar_thermal_notify(struct thermal_zone_device *zone, return 0; } +static const struct thermal_zone_of_device_ops rcar_thermal_zone_of_ops = { + .get_temp = rcar_thermal_of_get_temp, +}; + static struct thermal_zone_device_ops rcar_thermal_zone_ops = { .get_temp = rcar_thermal_get_temp, .get_trip_type = rcar_thermal_get_trip_type, @@ -308,11 +333,11 @@ static void rcar_thermal_work(struct work_struct *work) priv = container_of(work, struct rcar_thermal_priv, work.work); - rcar_thermal_get_temp(priv->zone, &cctemp); + cctemp = rcar_thermal_get_current_temp(priv); rcar_thermal_update_temp(priv); rcar_thermal_irq_enable(priv); - rcar_thermal_get_temp(priv->zone, &nctemp); + nctemp = rcar_thermal_get_current_temp(priv); if (nctemp != cctemp) thermal_zone_device_update(priv->zone); } @@ -391,6 +416,8 @@ static int rcar_thermal_probe(struct platform_device *pdev) struct rcar_thermal_priv *priv; struct device *dev = &pdev->dev; struct resource *res, *irq; + const struct of_device_id *of_id = of_match_device(rcar_thermal_dt_ids, dev); + unsigned long of_data = (unsigned long)of_id->data; int mres = 0; int i; int ret = -ENODEV; @@ -449,7 +476,13 @@ static int rcar_thermal_probe(struct platform_device *pdev) INIT_DELAYED_WORK(&priv->work, rcar_thermal_work); rcar_thermal_update_temp(priv); - priv->zone = thermal_zone_device_register("rcar_thermal", + if (of_data == USE_OF_THERMAL) + priv->zone = thermal_zone_of_sensor_register( + dev, i, priv, + &rcar_thermal_zone_of_ops); + else + priv->zone = thermal_zone_device_register( + "rcar_thermal", 1, 0, priv, &rcar_thermal_zone_ops, NULL, 0, idle);