diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-10-16 01:29:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:18 -0700 |
| commit | 69816699fa019145dd163949d65a07093af73b67 (patch) | |
| tree | 62f882257742edc6edda05349cf75789fb6fabe9 /arch/arm/mach-s3c2410/mach-bast.c | |
| parent | 9fa7bc016a688630386378c205f9ee0f7b2cc834 (diff) | |
s3c2410fb: adds pixclock to s3c2410fb_display
This patch adds pixelclock field to the s3c2410fb_display structure and make
use of it in the driver.
The Bast machine defined 9 modes but pixclock and margin values are defined
only for the 640x480 modes so I removed other modes.
This patch also fixes wrong display type constant for the SMDK2440 board.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: 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 'arch/arm/mach-s3c2410/mach-bast.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 112 |
1 files changed, 3 insertions, 109 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 61d5b2a2874c..103fc5724735 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c @@ -473,25 +473,7 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .width = 640, .height = 480, - .xres = 320, - .yres = 240, - .left_margin = 40, - .right_margin = 20, - .hsync_len = 88, - .upper_margin = 30, - .lower_margin = 32, - .vsync_len = 3, - - .bpp = 4, - - .lcdcon1 = 0x00000176, - .lcdcon5 = 0x00014b02, - }, - { - .type = S3C2410_LCDCON1_TFT, - .width = 640, - .height = 480, - + .pixclock = 33333, .xres = 640, .yres = 480, .bpp = 4, @@ -510,42 +492,7 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .width = 640, .height = 480, - .xres = 800, - .yres = 600, - .bpp = 4, - .left_margin = 40, - .right_margin = 20, - .hsync_len = 88, - .upper_margin = 30, - .lower_margin = 32, - .vsync_len = 3, - - .lcdcon1 = 0x00000176, - .lcdcon5 = 0x00014b02, - }, - { - .type = S3C2410_LCDCON1_TFT, - .width = 640, - .height = 480, - - .xres = 320, - .yres = 240, - .bpp = 8, - .left_margin = 40, - .right_margin = 20, - .hsync_len = 88, - .upper_margin = 30, - .lower_margin = 32, - .vsync_len = 3, - - .lcdcon1 = 0x00000176, - .lcdcon5 = 0x00014b02, - }, - { - .type = S3C2410_LCDCON1_TFT, - .width = 640, - .height = 480, - + .pixclock = 33333, .xres = 640, .yres = 480, .bpp = 8, @@ -564,42 +511,7 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .width = 640, .height = 480, - .xres = 800, - .yres = 600, - .bpp = 8, - .left_margin = 40, - .right_margin = 20, - .hsync_len = 88, - .upper_margin = 30, - .lower_margin = 32, - .vsync_len = 3, - - .lcdcon1 = 0x00000176, - .lcdcon5 = 0x00014b02, - }, - { - .type = S3C2410_LCDCON1_TFT, - .width = 640, - .height = 480, - - .xres = 320, - .yres = 240, - .bpp = 16, - .left_margin = 40, - .right_margin = 20, - .hsync_len = 88, - .upper_margin = 30, - .lower_margin = 32, - .vsync_len = 3, - - .lcdcon1 = 0x00000176, - .lcdcon5 = 0x00014b02, - }, - { - .type = S3C2410_LCDCON1_TFT, - .width = 640, - .height = 480, - + .pixclock = 33333, .xres = 640, .yres = 480, .bpp = 16, @@ -613,24 +525,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .lcdcon1 = 0x00000176, .lcdcon5 = 0x00014b02, }, - { - .type = S3C2410_LCDCON1_TFT, - .width = 640, - .height = 480, - - .xres = 800, - .yres = 600, - .bpp = 16, - .left_margin = 40, - .right_margin = 20, - .hsync_len = 88, - .upper_margin = 30, - .lower_margin = 32, - .vsync_len = 3, - - .lcdcon1 = 0x00000176, - .lcdcon5 = 0x00014b02, - }, }; /* LCD/VGA controller */ |