1 files changed, 58 insertions, 16 deletions

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index ceebabf45c53..f35289b1cea9 100644
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -47,6 +47,11 @@
 #define CONTROL0_OFFSET                 0x0
 #define CONTROL1_OFFSET                 0x4
 
+/* TSEN refers to the temperature sensors within the AP */
+#define CONTROL0_TSEN_START             BIT(0)
+#define CONTROL0_TSEN_RESET             BIT(1)
+#define CONTROL0_TSEN_ENABLE            BIT(2)
+
 struct armada_thermal_data;
 
 /* Marvell EBU Thermal Sensor Dev Structure */
@@ -66,10 +71,11 @@ struct armada_thermal_data {
         bool (*is_valid)(struct armada_thermal_priv *);
 
         /* Formula coeficients: temp = (b - m * reg) / div */
-        unsigned long coef_b;
-        unsigned long coef_m;
-        unsigned long coef_div;
+        s64 coef_b;
+        s64 coef_m;
+        u32 coef_div;
         bool inverted;
+        bool signed_sample;
 
         /* Register shift and mask to access the sensor temperature */
         unsigned int temp_shift;
@@ -155,6 +161,18 @@ static void armada380_init_sensor(struct platform_device *pdev,
         }
 }
 
+static void armada_ap806_init_sensor(struct platform_device *pdev,
+                                     struct armada_thermal_priv *priv)
+{
+        u32 reg;
+
+        reg = readl_relaxed(priv->control0);
+        reg &= ~CONTROL0_TSEN_RESET;
+        reg |= CONTROL0_TSEN_START | CONTROL0_TSEN_ENABLE;
+        writel(reg, priv->control0);
+        msleep(10);
+}
+
 static bool armada_is_valid(struct armada_thermal_priv *priv)
 {
         u32 reg = readl_relaxed(priv->status);
@@ -163,11 +181,11 @@ static bool armada_is_valid(struct armada_thermal_priv *priv)
 }
 
 static int armada_get_temp(struct thermal_zone_device *thermal,
-                          int *temp)
+                           int *temp)
 {
         struct armada_thermal_priv *priv = thermal->devdata;
-        unsigned long reg;
-        unsigned long m, b, div;
+        u32 reg, div;
+        s64 sample, b, m;
 
         /* Valid check */
         if (priv->data->is_valid && !priv->data->is_valid(priv)) {
@@ -178,6 +196,11 @@ static int armada_get_temp(struct thermal_zone_device *thermal,
 
         reg = readl_relaxed(priv->status);
         reg = (reg >> priv->data->temp_shift) & priv->data->temp_mask;
+        if (priv->data->signed_sample)
+                /* The most significant bit is the sign bit */
+                sample = sign_extend32(reg, fls(priv->data->temp_mask) - 1);
+        else
+                sample = reg;
 
         /* Get formula coeficients */
         b = priv->data->coef_b;
@@ -185,9 +208,10 @@ static int armada_get_temp(struct thermal_zone_device *thermal,
         div = priv->data->coef_div;
 
         if (priv->data->inverted)
-                *temp = ((m * reg) - b) / div;
+                *temp = div_s64((m * sample) - b, div);
         else
-                *temp = (b - (m * reg)) / div;
+                *temp = div_s64(b - (m * sample), div);
+
         return 0;
 }
 
@@ -199,8 +223,8 @@ static const struct armada_thermal_data armadaxp_data = {
         .init_sensor = armadaxp_init_sensor,
         .temp_shift = 10,
         .temp_mask = 0x1ff,
-        .coef_b = 3153000000UL,
-        .coef_m = 10000000UL,
+        .coef_b = 3153000000ULL,
+        .coef_m = 10000000ULL,
         .coef_div = 13825,
 };
 
@@ -210,8 +234,8 @@ static const struct armada_thermal_data armada370_data = {
         .is_valid_bit = BIT(9),
         .temp_shift = 10,
         .temp_mask = 0x1ff,
-        .coef_b = 3153000000UL,
-        .coef_m = 10000000UL,
+        .coef_b = 3153000000ULL,
+        .coef_m = 10000000ULL,
         .coef_div = 13825,
 };
 
@@ -221,8 +245,8 @@ static const struct armada_thermal_data armada375_data = {
         .is_valid_bit = BIT(10),
         .temp_shift = 0,
         .temp_mask = 0x1ff,
-        .coef_b = 3171900000UL,
-        .coef_m = 10000000UL,
+        .coef_b = 3171900000ULL,
+        .coef_m = 10000000ULL,
         .coef_div = 13616,
         .needs_control0 = true,
 };
@@ -233,12 +257,26 @@ static const struct armada_thermal_data armada380_data = {
         .is_valid_bit = BIT(10),
         .temp_shift = 0,
         .temp_mask = 0x3ff,
-        .coef_b = 1172499100UL,
-        .coef_m = 2000096UL,
+        .coef_b = 1172499100ULL,
+        .coef_m = 2000096ULL,
         .coef_div = 4201,
         .inverted = true,
 };
 
+static const struct armada_thermal_data armada_ap806_data = {
+        .is_valid = armada_is_valid,
+        .init_sensor = armada_ap806_init_sensor,
+        .is_valid_bit = BIT(16),
+        .temp_shift = 0,
+        .temp_mask = 0x3ff,
+        .coef_b = -150000LL,
+        .coef_m = 423ULL,
+        .coef_div = 1,
+        .inverted = true,
+        .signed_sample = true,
+        .needs_control0 = true,
+};
+
 static const struct of_device_id armada_thermal_id_table[] = {
         {
                 .compatible = "marvell,armadaxp-thermal",
@@ -257,6 +295,10 @@ static const struct of_device_id armada_thermal_id_table[] = {
                 .data       = &armada380_data,
         },
         {
+                .compatible = "marvell,armada-ap806-thermal",
+                .data       = &armada_ap806_data,
+        },
+        {
                 /* sentinel */
         },
 };