1 files changed, 7 insertions, 66 deletions

diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c
index bc52231dfd1c..89a139ed7d5b 100644
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@ -174,76 +174,12 @@ static void __init i2c_quirk(void)
         return;
 }
 
-#define A375_Z1_THERMAL_FIXUP_OFFSET 0xc
-
-static void __init thermal_quirk(void)
-{
-        struct device_node *np;
-        u32 dev, rev;
-        int res;
-
-        /*
-         * The early SoC Z1 revision needs a quirk to be applied in order
-         * for the thermal controller to work properly. This quirk breaks
-         * the thermal support if applied on a SoC that doesn't need it,
-         * so we enforce the SoC revision to be known.
-         */
-        res = mvebu_get_soc_id(&dev, &rev);
-        if (res < 0 || (res == 0 && rev > ARMADA_375_Z1_REV))
-                return;
-
-        for_each_compatible_node(np, NULL, "marvell,armada375-thermal") {
-                struct property *prop;
-                __be32 newval, *newprop, *oldprop;
-                int len;
-
-                /*
-                 * The register offset is at a wrong location. This quirk
-                 * creates a new reg property as a clone of the previous
-                 * one and corrects the offset.
-                 */
-                oldprop = (__be32 *)of_get_property(np, "reg", &len);
-                if (!oldprop)
-                        continue;
-
-                /* Create a duplicate of the 'reg' property */
-                prop = kzalloc(sizeof(*prop), GFP_KERNEL);
-                prop->length = len;
-                prop->name = kstrdup("reg", GFP_KERNEL);
-                prop->value = kzalloc(len, GFP_KERNEL);
-                memcpy(prop->value, oldprop, len);
-
-                /* Fixup the register offset of the second entry */
-                oldprop += 2;
-                newprop = (__be32 *)prop->value + 2;
-                newval = cpu_to_be32(be32_to_cpu(*oldprop) -
-                                     A375_Z1_THERMAL_FIXUP_OFFSET);
-                *newprop = newval;
-                of_update_property(np, prop);
-
-                /*
-                 * The thermal controller needs some quirk too, so let's change
-                 * the compatible string to reflect this and allow the driver
-                 * the take the necessary action.
-                 */
-                prop = kzalloc(sizeof(*prop), GFP_KERNEL);
-                prop->name = kstrdup("compatible", GFP_KERNEL);
-                prop->length = sizeof("marvell,armada375-z1-thermal");
-                prop->value = kstrdup("marvell,armada375-z1-thermal",
-                                                GFP_KERNEL);
-                of_update_property(np, prop);
-        }
-        return;
-}
-
 static void __init mvebu_dt_init(void)
 {
-        if (of_machine_is_compatible("plathome,openblocks-ax3-4"))
+        if (of_machine_is_compatible("marvell,armadaxp"))
                 i2c_quirk();
-        if (of_machine_is_compatible("marvell,a375-db")) {
+        if (of_machine_is_compatible("marvell,a375-db"))
                 external_abort_quirk();
-                thermal_quirk();
-        }
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
@@ -256,6 +192,11 @@ static const char * const armada_370_xp_dt_compat[] = {
 DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)")
         .l2c_aux_val    = 0,
         .l2c_aux_mask   = ~0,
+/*
+ * The following field (.smp) is still needed to ensure backward
+ * compatibility with old Device Trees that were not specifying the
+ * cpus enable-method property.
+ */
         .smp            = smp_ops(armada_xp_smp_ops),
         .init_machine   = mvebu_dt_init,
         .init_irq       = mvebu_init_irq,