Skip to content

Commit

Permalink
ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4
Browse files Browse the repository at this point in the history
[ Upstream commit 6469b2f ]

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>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Fixes: a761d51 ("ARM: dts: omap3: Add cpu_thermal zone")
Fixes: 0bbf6c5 ("arm: dts: add omap4 CPU thermal data")
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
tmlind authored and gregkh committed Oct 6, 2023
1 parent fe4da07 commit 4ccb056
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
3 changes: 1 addition & 2 deletions arch/arm/boot/dts/omap3-cpu-thermal.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 4 additions & 1 deletion arch/arm/boot/dts/omap4-cpu-thermal.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap443x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
};

&cpu_thermal {
thermal-sensors = <&bandgap>;
coefficients = <0 20000>;
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/omap4460.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
};

&cpu_thermal {
thermal-sensors = <&bandgap>;
coefficients = <348 (-9301)>;
};

Expand Down

0 comments on commit 4ccb056

Please sign in to comment.