[SPARC64] clock: Only probe central fhc clock on Enterprise boxes.
authorDavid S. Miller <davem@davemloft.net>
Thu, 29 Jun 2006 21:39:40 +0000 (14:39 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 29 Jun 2006 23:37:33 +0000 (16:37 -0700)
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/time.c

index 540e4b6c2dee4d9c155c3a566c0915b0cd853041..75cb6b4dc14ff1fce160c3f5c40934c4ef16abf1 100644 (file)
@@ -780,6 +780,13 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
        if (!model || !clock_model_matches(model))
                return -ENODEV;
 
+       /* On an Enterprise system there can be multiple mostek clocks.
+        * We should only match the one that is on the central FHC bus.
+        */
+       if (!strcmp(dp->parent, "fhc") &&
+           strcmp(dp->parent->parent, "central") != 0)
+               return -ENODEV;
+
        size = (op->resource[0].end - op->resource[0].start) + 1;
        regs = of_ioremap(&op->resource[0], 0, size, "clock");
        if (!regs)