2 files changed, 32 insertions, 1 deletions

diff --git a/Documentation/devicetree/bindings/thermal/armada-thermal.txt b/Documentation/devicetree/bindings/thermal/armada-thermal.txt
index 2a67e5135835..4cf024929a3f 100644
--- a/Documentation/devicetree/bindings/thermal/armada-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/armada-thermal.txt
@@ -1,4 +1,4 @@
-* Marvell Armada 370/375/XP thermal management
+* Marvell Armada 370/375/380/XP thermal management
 
 Required properties:
 
@@ -6,6 +6,7 @@ Required properties:
                 marvell,armada370-thermal
                 marvell,armada375-thermal
                 marvell,armada375-z1-thermal
+                marvell,armada380-thermal
                 marvell,armadaxp-thermal
 
                 Note: As the name suggests, "marvell,armada375-z1-thermal"
diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index e65c5e442ed5..9d1420acb391 100644
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -43,6 +43,7 @@
 #define A375_UNIT_CONTROL_MASK          0x7
 #define A375_READOUT_INVERT             BIT(15)
 #define A375_HW_RESETn                  BIT(8)
+#define A380_HW_RESET                   BIT(8)
 
 struct armada_thermal_data;
 
@@ -149,6 +150,19 @@ static void armada375_init_sensor(struct platform_device *pdev,
         mdelay(50);
 }
 
+static void armada380_init_sensor(struct platform_device *pdev,
+                                  struct armada_thermal_priv *priv)
+{
+        unsigned long reg = readl_relaxed(priv->control);
+
+        /* Reset hardware once */
+        if (!(reg & A380_HW_RESET)) {
+                reg |= A380_HW_RESET;
+                writel(reg, priv->control);
+                mdelay(10);
+        }
+}
+
 static bool armada_is_valid(struct armada_thermal_priv *priv)
 {
         unsigned long reg = readl_relaxed(priv->sensor);
@@ -220,6 +234,18 @@ static const struct armada_thermal_data armada375_data = {
         .coef_div = 13616,
 };
 
+static const struct armada_thermal_data armada380_data = {
+        .is_valid = armada_is_valid,
+        .init_sensor = armada380_init_sensor,
+        .is_valid_shift = 10,
+        .temp_shift = 0,
+        .temp_mask = 0x3ff,
+        .coef_b = 1169498786UL,
+        .coef_m = 2000000UL,
+        .coef_div = 4289,
+        .inverted = true,
+};
+
 static const struct of_device_id armada_thermal_id_table[] = {
         {
                 .compatible = "marvell,armadaxp-thermal",
@@ -238,6 +264,10 @@ static const struct of_device_id armada_thermal_id_table[] = {
                 .data       = &armada375_data,
         },
         {
+                .compatible = "marvell,armada380-thermal",
+                .data       = &armada380_data,
+        },
+        {
                 /* sentinel */
         },
 };