Commit 5f20f69b authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

s3c2410fb: add vertical margins fields to s3c2410fb_display

This patch adds vertical margins values to all
s3c24xx platform.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f28ef573
...@@ -179,6 +179,8 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = { ...@@ -179,6 +179,8 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = {
.bpp = 4, .bpp = 4,
.left_margin = 1 << (4 + 3), .left_margin = 1 << (4 + 3),
.right_margin = 8 << 3, .right_margin = 8 << 3,
.upper_margin = 0,
.lower_margin = 0,
.lcdcon1 = 0x00008225, .lcdcon1 = 0x00008225,
.lcdcon2 = 0x0027c000, .lcdcon2 = 0x0027c000,
......
...@@ -472,10 +472,13 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { ...@@ -472,10 +472,13 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.type = S3C2410_LCDCON1_TFT, .type = S3C2410_LCDCON1_TFT,
.width = 640, .width = 640,
.height = 480, .height = 480,
.xres = 320, .xres = 320,
.yres = 240, .yres = 240,
.left_margin = 40, .left_margin = 40,
.right_margin = 20, .right_margin = 20,
.upper_margin = 30,
.lower_margin = 32,
.bpp = 4, .bpp = 4,
...@@ -494,6 +497,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { ...@@ -494,6 +497,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.bpp = 4, .bpp = 4,
.left_margin = 40, .left_margin = 40,
.right_margin = 20, .right_margin = 20,
.upper_margin = 30,
.lower_margin = 32,
.lcdcon1 = 0x00000176, .lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2, .lcdcon2 = 0x1d77c7c2,
...@@ -510,6 +515,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { ...@@ -510,6 +515,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.bpp = 4, .bpp = 4,
.left_margin = 40, .left_margin = 40,
.right_margin = 20, .right_margin = 20,
.upper_margin = 30,
.lower_margin = 32,
.lcdcon1 = 0x00000176, .lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2, .lcdcon2 = 0x1d77c7c2,
...@@ -526,6 +533,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { ...@@ -526,6 +533,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.bpp = 8, .bpp = 8,
.left_margin = 40, .left_margin = 40,
.right_margin = 20, .right_margin = 20,
.upper_margin = 30,
.lower_margin = 32,
.lcdcon1 = 0x00000176, .lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2, .lcdcon2 = 0x1d77c7c2,
...@@ -542,6 +551,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { ...@@ -542,6 +551,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.bpp = 8, .bpp = 8,
.left_margin = 40, .left_margin = 40,
.right_margin = 20, .right_margin = 20,
.upper_margin = 30,
.lower_margin = 32,
.lcdcon1 = 0x00000176, .lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2, .lcdcon2 = 0x1d77c7c2,
...@@ -558,6 +569,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { ...@@ -558,6 +569,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.bpp = 8, .bpp = 8,
.left_margin = 40, .left_margin = 40,
.right_margin = 20, .right_margin = 20,
.upper_margin = 30,
.lower_margin = 32,
.lcdcon1 = 0x00000176, .lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2, .lcdcon2 = 0x1d77c7c2,
...@@ -574,6 +587,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { ...@@ -574,6 +587,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.bpp = 16, .bpp = 16,
.left_margin = 40, .left_margin = 40,
.right_margin = 20, .right_margin = 20,
.upper_margin = 30,
.lower_margin = 32,
.lcdcon1 = 0x00000176, .lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2, .lcdcon2 = 0x1d77c7c2,
...@@ -590,6 +605,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { ...@@ -590,6 +605,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.bpp = 16, .bpp = 16,
.left_margin = 40, .left_margin = 40,
.right_margin = 20, .right_margin = 20,
.upper_margin = 30,
.lower_margin = 32,
.lcdcon1 = 0x00000176, .lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2, .lcdcon2 = 0x1d77c7c2,
...@@ -606,6 +623,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { ...@@ -606,6 +623,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.bpp = 16, .bpp = 16,
.left_margin = 40, .left_margin = 40,
.right_margin = 20, .right_margin = 20,
.upper_margin = 30,
.lower_margin = 32,
.lcdcon1 = 0x00000176, .lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2, .lcdcon2 = 0x1d77c7c2,
......
...@@ -158,6 +158,8 @@ static struct s3c2410fb_display h1940_lcd __initdata = { ...@@ -158,6 +158,8 @@ static struct s3c2410fb_display h1940_lcd __initdata = {
.bpp = 16, .bpp = 16,
.left_margin = 20, .left_margin = 20,
.right_margin = 8, .right_margin = 8,
.upper_margin = 8,
.lower_margin = 7,
}; };
static struct s3c2410fb_mach_info h1940_fb_info __initdata = { static struct s3c2410fb_mach_info h1940_fb_info __initdata = {
......
...@@ -125,6 +125,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { ...@@ -125,6 +125,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
.bpp = 16, .bpp = 16,
.left_margin = 44, .left_margin = 44,
.right_margin = 116, .right_margin = 116,
.upper_margin = 19,
.lower_margin = 11,
}, },
{ {
/* Configuration for 480x640 toppoly TD028TTEC1 */ /* Configuration for 480x640 toppoly TD028TTEC1 */
...@@ -154,6 +156,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { ...@@ -154,6 +156,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
.bpp = 16, .bpp = 16,
.left_margin = 8, .left_margin = 8,
.right_margin = 24, .right_margin = 24,
.upper_margin = 2,
.lower_margin = 4,
}, },
{ {
/* Config for 240x320 LCD */ /* Config for 240x320 LCD */
...@@ -183,6 +187,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { ...@@ -183,6 +187,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
.bpp = 16, .bpp = 16,
.left_margin = 13, .left_margin = 13,
.right_margin = 8, .right_margin = 8,
.upper_margin = 2,
.lower_margin = 7,
}, },
}; };
......
...@@ -136,6 +136,8 @@ static struct s3c2410fb_display rx3715_lcdcfg __initdata = { ...@@ -136,6 +136,8 @@ static struct s3c2410fb_display rx3715_lcdcfg __initdata = {
.bpp = 16, .bpp = 16,
.left_margin = 36, .left_margin = 36,
.right_margin = 36, .right_margin = 36,
.upper_margin = 6,
.lower_margin = 7,
}; };
static struct s3c2410fb_mach_info rx3715_fb_info __initdata = { static struct s3c2410fb_mach_info rx3715_fb_info __initdata = {
......
...@@ -133,6 +133,8 @@ static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = { ...@@ -133,6 +133,8 @@ static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = {
.bpp = 16, .bpp = 16,
.left_margin = 20, .left_margin = 20,
.right_margin = 8, .right_margin = 8,
.upper_margin = 8,
.lower_margin = 7,
}; };
static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = { static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment