Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

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

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index eaaf59c..c2556cf 100644 (file)
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -35,10 +35,6 @@
 #define PMU_TDC0_OTF_CAL_MASK          (0x1 << 30)
 #define PMU_TDC0_START_CAL_MASK                (0x1 << 25)
 
-#define A375_Z1_CAL_RESET_LSB          0x8011e214
-#define A375_Z1_CAL_RESET_MSB          0x30a88019
-#define A375_Z1_WORKAROUND_BIT         BIT(9)
-
 #define A375_UNIT_CONTROL_SHIFT                27
 #define A375_UNIT_CONTROL_MASK         0x7
 #define A375_READOUT_INVERT            BIT(15)
@@ -124,24 +120,12 @@ static void armada375_init_sensor(struct platform_device *pdev,
                                  struct armada_thermal_priv *priv)
 {
        unsigned long reg;
-       bool quirk_needed =
-               !!of_device_is_compatible(pdev->dev.of_node,
-                                         "marvell,armada375-z1-thermal");
-
-       if (quirk_needed) {
-               /* Ensure these registers have the default (reset) values */
-               writel(A375_Z1_CAL_RESET_LSB, priv->control);
-               writel(A375_Z1_CAL_RESET_MSB, priv->control + 0x4);
-       }
 
        reg = readl(priv->control + 4);
        reg &= ~(A375_UNIT_CONTROL_MASK << A375_UNIT_CONTROL_SHIFT);
        reg &= ~A375_READOUT_INVERT;
        reg &= ~A375_HW_RESETn;
 
-       if (quirk_needed)
-               reg |= A375_Z1_WORKAROUND_BIT;
-
        writel(reg, priv->control + 4);
        mdelay(20);
 
@@ -259,10 +243,6 @@ static const struct of_device_id armada_thermal_id_table[] = {
                .compatible = "marvell,armada375-thermal",
                .data       = &armada375_data,
        },
-       {
-               .compatible = "marvell,armada375-z1-thermal",
-               .data       = &armada375_data,
-       },
        {
                .compatible = "marvell,armada380-thermal",
                .data       = &armada380_data,