These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / thermal / armada_thermal.c

diff --git a/kernel/drivers/thermal/armada_thermal.c b/kernel/drivers/thermal/armada_thermal.c
index 01255fd..ae75328 100644 (file)
--- a/kernel/drivers/thermal/armada_thermal.c
+++ b/kernel/drivers/thermal/armada_thermal.c
@@ -155,7 +155,7 @@ static bool armada_is_valid(struct armada_thermal_priv *priv)
 }
 
 static int armada_get_temp(struct thermal_zone_device *thermal,
-                         unsigned long *temp)
+                         int *temp)
 {
        struct armada_thermal_priv *priv = thermal->devdata;
        unsigned long reg;
@@ -224,9 +224,9 @@ static const struct armada_thermal_data armada380_data = {
        .is_valid_shift = 10,
        .temp_shift = 0,
        .temp_mask = 0x3ff,
-       .coef_b = 2931108200UL,
-       .coef_m = 5000000UL,
-       .coef_div = 10502,
+       .coef_b = 1172499100UL,
+       .coef_m = 2000096UL,
+       .coef_div = 4201,
        .inverted = true,
 };