atyfb: Fix XCLK frequency on Apple iBook1

Fix a regression on Apple iBook1.  Changes in the clock init code caused an
incorrect XCLK frequency to be used leading to a corrupted display.

Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Cc: Olaf Hering <olaf@aepfle.de>
Cc: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 8d3455da663a..2fbff6317433 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2290,15 +2290,6 @@ static int __devinit aty_init(struct fb_info *info)
         init_waitqueue_head(&par->vblank.wait);
         spin_lock_init(&par->int_lock);
 
-#ifdef CONFIG_PPC_PMAC
-        /* The Apple iBook1 uses non-standard memory frequencies. We detect it
-         * and set the frequency manually. */
-        if (machine_is_compatible("PowerBook2,1")) {
-                par->pll_limits.mclk = 70;
-                par->pll_limits.xclk = 53;
-        }
-#endif
-
 #ifdef CONFIG_FB_ATY_GX
         if (!M64_HAS(INTEGRATED)) {
                 u32 stat0;
@@ -2383,6 +2374,14 @@ static int __devinit aty_init(struct fb_info *info)
                         par->pll_limits.xclk = (par->pll_limits.xclk + 1) >> 1;
         }
 #endif
+#ifdef CONFIG_PPC_PMAC
+        /* The Apple iBook1 uses non-standard memory frequencies. We detect it
+         * and set the frequency manually. */
+        if (machine_is_compatible("PowerBook2,1")) {
+                par->pll_limits.mclk = 70;
+                par->pll_limits.xclk = 53;
+        }
+#endif
 
         /* Allow command line to override clocks. */
         if (pll)