aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorVille Syrjala <syrjala@sci.fi>2007-06-27 17:09:46 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-28 14:34:53 -0400
commitc0887eedb4498e20e7895508b7af8e419e397405 (patch)
tree1d42bc2b4520e799d29ae3b459b9cc3840509c40 /drivers/video
parentd4c5cdb3e099da7cc64df622b02ff7659babe16e (diff)
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/aty/atyfb_base.c17
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)
2290 init_waitqueue_head(&par->vblank.wait); 2290 init_waitqueue_head(&par->vblank.wait);
2291 spin_lock_init(&par->int_lock); 2291 spin_lock_init(&par->int_lock);
2292 2292
2293#ifdef CONFIG_PPC_PMAC
2294 /* The Apple iBook1 uses non-standard memory frequencies. We detect it
2295 * and set the frequency manually. */
2296 if (machine_is_compatible("PowerBook2,1")) {
2297 par->pll_limits.mclk = 70;
2298 par->pll_limits.xclk = 53;
2299 }
2300#endif
2301
2302#ifdef CONFIG_FB_ATY_GX 2293#ifdef CONFIG_FB_ATY_GX
2303 if (!M64_HAS(INTEGRATED)) { 2294 if (!M64_HAS(INTEGRATED)) {
2304 u32 stat0; 2295 u32 stat0;
@@ -2383,6 +2374,14 @@ static int __devinit aty_init(struct fb_info *info)
2383 par->pll_limits.xclk = (par->pll_limits.xclk + 1) >> 1; 2374 par->pll_limits.xclk = (par->pll_limits.xclk + 1) >> 1;
2384 } 2375 }
2385#endif 2376#endif
2377#ifdef CONFIG_PPC_PMAC
2378 /* The Apple iBook1 uses non-standard memory frequencies. We detect it
2379 * and set the frequency manually. */
2380 if (machine_is_compatible("PowerBook2,1")) {
2381 par->pll_limits.mclk = 70;
2382 par->pll_limits.xclk = 53;
2383 }
2384#endif
2386 2385
2387 /* Allow command line to override clocks. */ 2386 /* Allow command line to override clocks. */
2388 if (pll) 2387 if (pll)