| Message ID | 20230911040828.39386-1-tony@atomide.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4 | expand |
Hi, On Mon, Sep 11, 2023 at 07:08:24AM +0300, Tony Lindgren wrote: > Fix "thermal_sys: cpu_thermal: Failed to read thermal-sensors cells: -2" > error on boot for omap3/4. This is caused by wrong addressing in the dts > for bandgap sensor for single sensor instances. > > Note that omap4-cpu-thermal.dtsi is shared across omap4/5 and dra7, so > we can't just change the addressing in omap4-cpu-thermal.dtsi. > > Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> > Cc: Carl Philipp Klemm <philipp@uvos.xyz> > Cc: Merlijn Wajer <merlijn@wizzup.org> > Cc: Pavel Machek <pavel@ucw.cz> > Cc: Sebastian Reichel <sre@kernel.org> > Fixes: a761d517bbb1 ("ARM: dts: omap3: Add cpu_thermal zone") > Fixes: 0bbf6c54d100 ("arm: dts: add omap4 CPU thermal data") > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> -- Sebastian > arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi | 3 +-- > arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi | 5 ++++- > arch/arm/boot/dts/ti/omap/omap443x.dtsi | 1 + > arch/arm/boot/dts/ti/omap/omap4460.dtsi | 1 + > 4 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi b/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi > --- a/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi > +++ b/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi > @@ -12,8 +12,7 @@ cpu_thermal: cpu-thermal { > polling-delay = <1000>; /* milliseconds */ > coefficients = <0 20000>; > > - /* sensor ID */ > - thermal-sensors = <&bandgap 0>; > + thermal-sensors = <&bandgap>; > > cpu_trips: trips { > cpu_alert0: cpu_alert { > diff --git a/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi b/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi > --- a/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi > +++ b/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi > @@ -12,7 +12,10 @@ cpu_thermal: cpu_thermal { > polling-delay-passive = <250>; /* milliseconds */ > polling-delay = <1000>; /* milliseconds */ > > - /* sensor ID */ > + /* > + * See 44xx files for single sensor addressing, omap5 and dra7 need > + * also sensor ID for addressing. > + */ > thermal-sensors = <&bandgap 0>; > > cpu_trips: trips { > diff --git a/arch/arm/boot/dts/ti/omap/omap443x.dtsi b/arch/arm/boot/dts/ti/omap/omap443x.dtsi > --- a/arch/arm/boot/dts/ti/omap/omap443x.dtsi > +++ b/arch/arm/boot/dts/ti/omap/omap443x.dtsi > @@ -69,6 +69,7 @@ abb_iva: regulator-abb-iva { > }; > > &cpu_thermal { > + thermal-sensors = <&bandgap>; > coefficients = <0 20000>; > }; > > diff --git a/arch/arm/boot/dts/ti/omap/omap4460.dtsi b/arch/arm/boot/dts/ti/omap/omap4460.dtsi > --- a/arch/arm/boot/dts/ti/omap/omap4460.dtsi > +++ b/arch/arm/boot/dts/ti/omap/omap4460.dtsi > @@ -79,6 +79,7 @@ abb_iva: regulator-abb-iva { > }; > > &cpu_thermal { > + thermal-sensors = <&bandgap>; > coefficients = <348 (-9301)>; > }; > > -- > 2.42.0
diff --git a/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi b/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi --- a/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi +++ b/arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi @@ -12,8 +12,7 @@ cpu_thermal: cpu-thermal { polling-delay = <1000>; /* milliseconds */ coefficients = <0 20000>; - /* sensor ID */ - thermal-sensors = <&bandgap 0>; + thermal-sensors = <&bandgap>; cpu_trips: trips { cpu_alert0: cpu_alert { diff --git a/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi b/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi --- a/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi +++ b/arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi @@ -12,7 +12,10 @@ cpu_thermal: cpu_thermal { polling-delay-passive = <250>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */ - /* sensor ID */ + /* + * See 44xx files for single sensor addressing, omap5 and dra7 need + * also sensor ID for addressing. + */ thermal-sensors = <&bandgap 0>; cpu_trips: trips { diff --git a/arch/arm/boot/dts/ti/omap/omap443x.dtsi b/arch/arm/boot/dts/ti/omap/omap443x.dtsi --- a/arch/arm/boot/dts/ti/omap/omap443x.dtsi +++ b/arch/arm/boot/dts/ti/omap/omap443x.dtsi @@ -69,6 +69,7 @@ abb_iva: regulator-abb-iva { }; &cpu_thermal { + thermal-sensors = <&bandgap>; coefficients = <0 20000>; }; diff --git a/arch/arm/boot/dts/ti/omap/omap4460.dtsi b/arch/arm/boot/dts/ti/omap/omap4460.dtsi --- a/arch/arm/boot/dts/ti/omap/omap4460.dtsi +++ b/arch/arm/boot/dts/ti/omap/omap4460.dtsi @@ -79,6 +79,7 @@ abb_iva: regulator-abb-iva { }; &cpu_thermal { + thermal-sensors = <&bandgap>; coefficients = <348 (-9301)>; };
Fix "thermal_sys: cpu_thermal: Failed to read thermal-sensors cells: -2" error on boot for omap3/4. This is caused by wrong addressing in the dts for bandgap sensor for single sensor instances. Note that omap4-cpu-thermal.dtsi is shared across omap4/5 and dra7, so we can't just change the addressing in omap4-cpu-thermal.dtsi. Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> Cc: Carl Philipp Klemm <philipp@uvos.xyz> Cc: Merlijn Wajer <merlijn@wizzup.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Sebastian Reichel <sre@kernel.org> Fixes: a761d517bbb1 ("ARM: dts: omap3: Add cpu_thermal zone") Fixes: 0bbf6c54d100 ("arm: dts: add omap4 CPU thermal data") Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi | 3 +-- arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi | 5 ++++- arch/arm/boot/dts/ti/omap/omap443x.dtsi | 1 + arch/arm/boot/dts/ti/omap/omap4460.dtsi | 1 + 4 files changed, 7 insertions(+), 3 deletions(-)