From 93d11f5a15020a514e522e678b2b3e7a1bc01f86 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Tue, 16 Oct 2007 01:29:00 -0700 Subject: s3c2410fb: add pulse length fields to s3c2410fb_display This patch adds synchronization pulse lenght fields to the s3c2410fb_display structure and makes use of them in the driver. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/arm/mach-s3c2410/mach-amlm5900.c | 1 + arch/arm/mach-s3c2410/mach-bast.c | 18 ++++++++++++++++++ arch/arm/mach-s3c2410/mach-h1940.c | 2 ++ arch/arm/mach-s3c2410/mach-qt2410.c | 6 ++++++ 4 files changed, 27 insertions(+) (limited to 'arch/arm/mach-s3c2410') diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c index 5f51a80fcd5..4c958b7c09d 100644 --- a/arch/arm/mach-s3c2410/mach-amlm5900.c +++ b/arch/arm/mach-s3c2410/mach-amlm5900.c @@ -179,6 +179,7 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = { .bpp = 4, .left_margin = 1 << (4 + 3), .right_margin = 8 << 3, + .hsync_len = 48, .upper_margin = 0, .lower_margin = 0, diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 7b54f3c2a2d..e9c9df07892 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c @@ -477,8 +477,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .yres = 240, .left_margin = 40, .right_margin = 20, + .hsync_len = 88, .upper_margin = 30, .lower_margin = 32, + .vsync_len = 3, .bpp = 4, @@ -497,8 +499,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .bpp = 4, .left_margin = 40, .right_margin = 20, + .hsync_len = 88, .upper_margin = 30, .lower_margin = 32, + .vsync_len = 3, .lcdcon1 = 0x00000176, .lcdcon2 = 0x1d77c7c2, @@ -515,8 +519,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .bpp = 4, .left_margin = 40, .right_margin = 20, + .hsync_len = 88, .upper_margin = 30, .lower_margin = 32, + .vsync_len = 3, .lcdcon1 = 0x00000176, .lcdcon2 = 0x1d77c7c2, @@ -533,8 +539,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .bpp = 8, .left_margin = 40, .right_margin = 20, + .hsync_len = 88, .upper_margin = 30, .lower_margin = 32, + .vsync_len = 3, .lcdcon1 = 0x00000176, .lcdcon2 = 0x1d77c7c2, @@ -551,8 +559,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .bpp = 8, .left_margin = 40, .right_margin = 20, + .hsync_len = 88, .upper_margin = 30, .lower_margin = 32, + .vsync_len = 3, .lcdcon1 = 0x00000176, .lcdcon2 = 0x1d77c7c2, @@ -569,8 +579,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .bpp = 8, .left_margin = 40, .right_margin = 20, + .hsync_len = 88, .upper_margin = 30, .lower_margin = 32, + .vsync_len = 3, .lcdcon1 = 0x00000176, .lcdcon2 = 0x1d77c7c2, @@ -587,8 +599,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .bpp = 16, .left_margin = 40, .right_margin = 20, + .hsync_len = 88, .upper_margin = 30, .lower_margin = 32, + .vsync_len = 3, .lcdcon1 = 0x00000176, .lcdcon2 = 0x1d77c7c2, @@ -605,8 +619,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .bpp = 16, .left_margin = 40, .right_margin = 20, + .hsync_len = 88, .upper_margin = 30, .lower_margin = 32, + .vsync_len = 3, .lcdcon1 = 0x00000176, .lcdcon2 = 0x1d77c7c2, @@ -623,8 +639,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { .bpp = 16, .left_margin = 40, .right_margin = 20, + .hsync_len = 88, .upper_margin = 30, .lower_margin = 32, + .vsync_len = 3, .lcdcon1 = 0x00000176, .lcdcon2 = 0x1d77c7c2, diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 1c9d6c69b71..c0933b6c71b 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c @@ -158,8 +158,10 @@ static struct s3c2410fb_display h1940_lcd __initdata = { .bpp = 16, .left_margin = 20, .right_margin = 8, + .hsync_len = 4, .upper_margin = 8, .lower_margin = 7, + .vsync_len = 1, }; static struct s3c2410fb_mach_info h1940_fb_info __initdata = { diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c index 98fbca2b7c2..50c0939a249 100644 --- a/arch/arm/mach-s3c2410/mach-qt2410.c +++ b/arch/arm/mach-s3c2410/mach-qt2410.c @@ -125,8 +125,10 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { .bpp = 16, .left_margin = 44, .right_margin = 116, + .hsync_len = 96, .upper_margin = 19, .lower_margin = 11, + .vsync_len = 15, }, { /* Configuration for 480x640 toppoly TD028TTEC1 */ @@ -156,8 +158,10 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { .bpp = 16, .left_margin = 8, .right_margin = 24, + .hsync_len = 8, .upper_margin = 2, .lower_margin = 4, + .vsync_len = 2, }, { /* Config for 240x320 LCD */ @@ -187,8 +191,10 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { .bpp = 16, .left_margin = 13, .right_margin = 8, + .hsync_len = 4, .upper_margin = 2, .lower_margin = 7, + .vsync_len = 4, }, }; -- cgit v1.2.3