thermal: ti-soc-thermal: Use non-inverted define for omap4
authorTony Lindgren <tony@atomide.com>
Fri, 5 Feb 2021 13:45:34 +0000 (15:45 +0200)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Mon, 15 Feb 2021 20:19:32 +0000 (21:19 +0100)
When we set bit 10 high we use continuous mode and not single
mode. Let's correct this to avoid confusion. No functional
changes here, the code does the right thing with bit 10.

Cc: Adam Ford <aford173@gmail.com>
Cc: Carl Philipp Klemm <philipp@uvos.xyz>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: H. Nikolaus Schaller <hns@goldelico.com>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Cc: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested-by: Adam Ford <aford173@gmail.com> #logicpd-torpedo-37xx-devkit
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210205134534.49200-5-tony@atomide.com
drivers/thermal/ti-soc-thermal/omap4-thermal-data.c
drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h

index 80c051a..b4ef734 100644 (file)
@@ -24,7 +24,7 @@ omap4430_mpu_temp_sensor_registers = {
        .bgap_dtemp_mask = OMAP4430_BGAP_TEMP_SENSOR_DTEMP_MASK,
 
        .bgap_mode_ctrl = OMAP4430_TEMP_SENSOR_CTRL_OFFSET,
-       .mode_ctrl_mask = OMAP4430_SINGLE_MODE_MASK,
+       .mode_ctrl_mask = OMAP4430_CONTINUOUS_MODE_MASK,
 
        .bgap_efuse = OMAP4430_FUSE_OPP_BGAP,
 };
@@ -97,7 +97,7 @@ omap4460_mpu_temp_sensor_registers = {
        .mask_cold_mask = OMAP4460_MASK_COLD_MASK,
 
        .bgap_mode_ctrl = OMAP4460_BGAP_CTRL_OFFSET,
-       .mode_ctrl_mask = OMAP4460_SINGLE_MODE_MASK,
+       .mode_ctrl_mask = OMAP4460_CONTINUOUS_MODE_MASK,
 
        .bgap_counter = OMAP4460_BGAP_COUNTER_OFFSET,
        .counter_mask = OMAP4460_COUNTER_MASK,
index 9a3955c..c63f439 100644 (file)
@@ -40,7 +40,7 @@
 /* OMAP4430.TEMP_SENSOR bits */
 #define OMAP4430_BGAP_TEMPSOFF_MASK                    BIT(12)
 #define OMAP4430_BGAP_TSHUT_MASK                       BIT(11)
-#define OMAP4430_SINGLE_MODE_MASK                      BIT(10)
+#define OMAP4430_CONTINUOUS_MODE_MASK                  BIT(10)
 #define OMAP4430_BGAP_TEMP_SENSOR_SOC_MASK             BIT(9)
 #define OMAP4430_BGAP_TEMP_SENSOR_EOCZ_MASK            BIT(8)
 #define OMAP4430_BGAP_TEMP_SENSOR_DTEMP_MASK           (0xff << 0)
 #define OMAP4460_BGAP_TEMP_SENSOR_DTEMP_MASK           (0x3ff << 0)
 
 /* OMAP4460.BANDGAP_CTRL bits */
-#define OMAP4460_SINGLE_MODE_MASK                      BIT(31)
+#define OMAP4460_CONTINUOUS_MODE_MASK                  BIT(31)
 #define OMAP4460_MASK_HOT_MASK                         BIT(1)
 #define OMAP4460_MASK_COLD_MASK                                BIT(0)