Merge tag 'md/3.17' of git://neil.brown.name/md

[cascardo/linux.git] / arch / arm / mach-mvebu / board-v7.c

diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c
index b2524d6..6478626 100644 (file)
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@ -34,14 +34,14 @@
 #include "coherency.h"
 #include "mvebu-soc-id.h"
 
+static void __iomem *scu_base;
+
 /*
  * Enables the SCU when available. Obviously, this is only useful on
  * Cortex-A based SOCs, not on PJ4B based ones.
  */
 static void __init mvebu_scu_enable(void)
 {
-       void __iomem *scu_base;
-
        struct device_node *np =
                of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
        if (np) {
@@ -51,6 +51,11 @@ static void __init mvebu_scu_enable(void)
        }
 }
 
+void __iomem *mvebu_get_scu_base(void)
+{
+       return scu_base;
+}
+
 /*
  * Early versions of Armada 375 SoC have a bug where the BootROM
  * leaves an external data abort pending. The kernel is hit by this
@@ -125,8 +130,16 @@ static void __init thermal_quirk(void)
 {
        struct device_node *np;
        u32 dev, rev;
+       int res;
 
-       if (mvebu_get_soc_id(&dev, &rev) == 0 && rev > ARMADA_375_Z1_REV)
+       /*
+        * 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") {
@@ -160,7 +173,8 @@ static void __init thermal_quirk(void)
 
                /*
                 * The thermal controller needs some quirk too, so let's change
-                * the compatible string to reflect this.
+                * 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);