Commit c0887eed authored by Ville Syrjala's avatar Ville Syrjala Committed by Linus Torvalds

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: default avatarVille Syrjala <syrjala@sci.fi>
Cc: Olaf Hering <olaf@aepfle.de>
Cc: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d4c5cdb3
...@@ -2290,15 +2290,6 @@ static int __devinit aty_init(struct fb_info *info) ...@@ -2290,15 +2290,6 @@ static int __devinit aty_init(struct fb_info *info)
init_waitqueue_head(&par->vblank.wait); init_waitqueue_head(&par->vblank.wait);
spin_lock_init(&par->int_lock); 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 #ifdef CONFIG_FB_ATY_GX
if (!M64_HAS(INTEGRATED)) { if (!M64_HAS(INTEGRATED)) {
u32 stat0; u32 stat0;
...@@ -2383,6 +2374,14 @@ static int __devinit aty_init(struct fb_info *info) ...@@ -2383,6 +2374,14 @@ static int __devinit aty_init(struct fb_info *info)
par->pll_limits.xclk = (par->pll_limits.xclk + 1) >> 1; par->pll_limits.xclk = (par->pll_limits.xclk + 1) >> 1;
} }
#endif #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. */ /* Allow command line to override clocks. */
if (pll) if (pll)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment