Merge tag 'ovl-update-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

[linux.git] / drivers / thermal / armada_thermal.c

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 709a22f455e99b6a393fb34fc33666f801e5e348..7c447cd149e7fab3c25939041c4e6bf98e783167 100644 (file)
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -21,8 +21,6 @@
 
 #include "thermal_core.h"
 
-#define TO_MCELSIUS(c)                 ((c) * 1000)
-
 /* Thermal Manager Control and Status Register */
 #define PMU_TDC0_SW_RST_MASK           (0x1 << 1)
 #define PMU_TM_DISABLE_OFFS            0
@@ -155,6 +153,9 @@ static void armadaxp_init(struct platform_device *pdev,
 
        regmap_write(priv->syscon, data->syscon_control1_off, reg);
 
+       reg &= ~PMU_TDC0_SW_RST_MASK;
+       regmap_write(priv->syscon, data->syscon_control1_off, reg);
+
        /* Enable the sensor */
        regmap_read(priv->syscon, data->syscon_status_off, &reg);
        reg &= ~PMU_TM_DISABLE_MASK;
@@ -578,7 +579,7 @@ static const struct armada_thermal_data armadaxp_data = {
        .coef_m = 10000000ULL,
        .coef_div = 13825,
        .syscon_status_off = 0xb0,
-       .syscon_control1_off = 0xd0,
+       .syscon_control1_off = 0x2d0,
 };
 
 static const struct armada_thermal_data armada370_data = {