diff options
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 17 |
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) |