diff options
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-bast.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 83 |
1 files changed, 59 insertions, 24 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index bc926992b4e4..587864fe25fb 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -467,35 +467,70 @@ static struct platform_device bast_device_axpp = { | |||
467 | 467 | ||
468 | /* LCD/VGA controller */ | 468 | /* LCD/VGA controller */ |
469 | 469 | ||
470 | static struct s3c2410fb_mach_info __initdata bast_lcd_info = { | 470 | static struct s3c2410fb_display __initdata bast_lcd_info[] = { |
471 | .width = 640, | 471 | { |
472 | .height = 480, | 472 | .type = S3C2410_LCDCON1_TFT, |
473 | 473 | .width = 640, | |
474 | .xres = { | 474 | .height = 480, |
475 | .min = 320, | 475 | |
476 | .max = 1024, | 476 | .pixclock = 33333, |
477 | .defval = 640, | 477 | .xres = 640, |
478 | }, | 478 | .yres = 480, |
479 | .bpp = 4, | ||
480 | .left_margin = 40, | ||
481 | .right_margin = 20, | ||
482 | .hsync_len = 88, | ||
483 | .upper_margin = 30, | ||
484 | .lower_margin = 32, | ||
485 | .vsync_len = 3, | ||
479 | 486 | ||
480 | .yres = { | 487 | .lcdcon5 = 0x00014b02, |
481 | .min = 240, | ||
482 | .max = 600, | ||
483 | .defval = 480, | ||
484 | }, | 488 | }, |
489 | { | ||
490 | .type = S3C2410_LCDCON1_TFT, | ||
491 | .width = 640, | ||
492 | .height = 480, | ||
493 | |||
494 | .pixclock = 33333, | ||
495 | .xres = 640, | ||
496 | .yres = 480, | ||
497 | .bpp = 8, | ||
498 | .left_margin = 40, | ||
499 | .right_margin = 20, | ||
500 | .hsync_len = 88, | ||
501 | .upper_margin = 30, | ||
502 | .lower_margin = 32, | ||
503 | .vsync_len = 3, | ||
485 | 504 | ||
486 | .bpp = { | 505 | .lcdcon5 = 0x00014b02, |
487 | .min = 4, | ||
488 | .max = 16, | ||
489 | .defval = 8, | ||
490 | }, | 506 | }, |
507 | { | ||
508 | .type = S3C2410_LCDCON1_TFT, | ||
509 | .width = 640, | ||
510 | .height = 480, | ||
511 | |||
512 | .pixclock = 33333, | ||
513 | .xres = 640, | ||
514 | .yres = 480, | ||
515 | .bpp = 16, | ||
516 | .left_margin = 40, | ||
517 | .right_margin = 20, | ||
518 | .hsync_len = 88, | ||
519 | .upper_margin = 30, | ||
520 | .lower_margin = 32, | ||
521 | .vsync_len = 3, | ||
491 | 522 | ||
492 | .regs = { | ||
493 | .lcdcon1 = 0x00000176, | ||
494 | .lcdcon2 = 0x1d77c7c2, | ||
495 | .lcdcon3 = 0x013a7f13, | ||
496 | .lcdcon4 = 0x00000057, | ||
497 | .lcdcon5 = 0x00014b02, | 523 | .lcdcon5 = 0x00014b02, |
498 | } | 524 | }, |
525 | }; | ||
526 | |||
527 | /* LCD/VGA controller */ | ||
528 | |||
529 | static struct s3c2410fb_mach_info __initdata bast_fb_info = { | ||
530 | |||
531 | .displays = bast_lcd_info, | ||
532 | .num_displays = ARRAY_SIZE(bast_lcd_info), | ||
533 | .default_display = 4, | ||
499 | }; | 534 | }; |
500 | 535 | ||
501 | /* Standard BAST devices */ | 536 | /* Standard BAST devices */ |
@@ -552,7 +587,7 @@ static void __init bast_map_io(void) | |||
552 | 587 | ||
553 | static void __init bast_init(void) | 588 | static void __init bast_init(void) |
554 | { | 589 | { |
555 | s3c24xx_fb_set_platdata(&bast_lcd_info); | 590 | s3c24xx_fb_set_platdata(&bast_fb_info); |
556 | platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices)); | 591 | platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices)); |
557 | } | 592 | } |
558 | 593 | ||