ppc32: Fix time calibration on some G4 models

diff --git a/arch/ppc/platforms/pmac_time.c b/arch/ppc/platforms/pmac_time.c
index 923afbdc7c563fb623474e48ab4d61dd39d74fd1..cd8e3e7c4d13e0edeb5aab806eb485fde860d48a 100644 (file)
--- a/arch/ppc/platforms/pmac_time.c
+++ b/arch/ppc/platforms/pmac_time.c
@@ -266,6 +266,14 @@ pmac_calibrate_decr(void)
                if (via_calibrate_decr())
                        return;
 
+       /* Special case: QuickSilver G4s seem to have a badly calibrated
+        * timebase-frequency in OF, VIA is much better on these. We should
+        * probably implement calibration based on the KL timer on these
+        * machines anyway... -BenH
+        */
+       if (machine_is_compatible("PowerMac3,5"))
+               if (via_calibrate_decr())
+                       return;
        /*
         * The cpu node should have a timebase-frequency property
         * to tell us the rate at which the decrementer counts.