ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4

[ Upstream commit 6469b2feade8fd82d224dd3734e146536f3e9f0e ]

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: 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/omap3-cpu-thermal.dtsi b/arch/arm/boot/dts/omap3-cpu-thermal.dtsi
index 0da759f8e2c2df351c44a7c3f4e87ef5a6a6fcf0..7dd2340bc5e4556a9c840209a1695ccc2279a024 100644 (file)
--- a/arch/arm/boot/dts/omap3-cpu-thermal.dtsi
+++ b/arch/arm/boot/dts/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/omap4-cpu-thermal.dtsi b/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
index 801b4f10350c126c53baa248cd4699cdde6f7bcd..d484ec1e4fd86b7c8f28a0de47942fcb3bafe439 100644 (file)
--- a/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
+++ b/arch/arm/boot/dts/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/omap443x.dtsi b/arch/arm/boot/dts/omap443x.dtsi
index 238aceb799f89584c5d527e869e090ed0e781f5d..2104170fe2cd7080b683c362f36693249bcefb43 100644 (file)
--- a/arch/arm/boot/dts/omap443x.dtsi
+++ b/arch/arm/boot/dts/omap443x.dtsi
@@ -69,6 +69,7 @@
 };
 
 &cpu_thermal {
+       thermal-sensors = <&bandgap>;
        coefficients = <0 20000>;
 };
 

diff --git a/arch/arm/boot/dts/omap4460.dtsi b/arch/arm/boot/dts/omap4460.dtsi
index 1b27a862ae810a5e7100e7632f66e324e6c3655e..a6764750d4476c0910a6eddf5c47268a0daebaba 100644 (file)
--- a/arch/arm/boot/dts/omap4460.dtsi
+++ b/arch/arm/boot/dts/omap4460.dtsi
@@ -79,6 +79,7 @@
 };
 
 &cpu_thermal {
+       thermal-sensors = <&bandgap>;
        coefficients = <348 (-9301)>;
 };