s3c2410fb: add vertical margins fields to s3c2410fb_display

This patch adds vertical margins values to all
s3c24xx platform.

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>

diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index 74801ce..5f51a80 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -179,6 +179,8 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = {
        .bpp            = 4,
        .left_margin    = 1 << (4 + 3),
        .right_margin   = 8 << 3,
+       .upper_margin   = 0,
+       .lower_margin   = 0,
 
        .lcdcon1        = 0x00008225,
        .lcdcon2        = 0x0027c000,

diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 6e46c20..7b54f3c 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -472,10 +472,13 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
                .type           = S3C2410_LCDCON1_TFT,
                .width          = 640,
                .height         = 480,
+
                .xres           = 320,
                .yres           = 240,
                .left_margin    = 40,
                .right_margin   = 20,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
 
                .bpp            = 4,
 
@@ -494,6 +497,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
                .bpp            = 4,
                .left_margin    = 40,
                .right_margin   = 20,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
 
                .lcdcon1        = 0x00000176,
                .lcdcon2        = 0x1d77c7c2,
@@ -510,6 +515,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
                .bpp            = 4,
                .left_margin    = 40,
                .right_margin   = 20,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
 
                .lcdcon1        = 0x00000176,
                .lcdcon2        = 0x1d77c7c2,
@@ -526,6 +533,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
                .bpp            = 8,
                .left_margin    = 40,
                .right_margin   = 20,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
 
                .lcdcon1        = 0x00000176,
                .lcdcon2        = 0x1d77c7c2,
@@ -542,6 +551,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
                .bpp            = 8,
                .left_margin    = 40,
                .right_margin   = 20,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
 
                .lcdcon1        = 0x00000176,
                .lcdcon2        = 0x1d77c7c2,
@@ -558,6 +569,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
                .bpp            = 8,
                .left_margin    = 40,
                .right_margin   = 20,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
 
                .lcdcon1        = 0x00000176,
                .lcdcon2        = 0x1d77c7c2,
@@ -574,6 +587,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
                .bpp            = 16,
                .left_margin    = 40,
                .right_margin   = 20,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
 
                .lcdcon1        = 0x00000176,
                .lcdcon2        = 0x1d77c7c2,
@@ -590,6 +605,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
                .bpp            = 16,
                .left_margin    = 40,
                .right_margin   = 20,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
 
                .lcdcon1        = 0x00000176,
                .lcdcon2        = 0x1d77c7c2,
@@ -606,6 +623,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
                .bpp            = 16,
                .left_margin    = 40,
                .right_margin   = 20,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
 
                .lcdcon1        = 0x00000176,
                .lcdcon2        = 0x1d77c7c2,

diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 52d7685..1c9d6c6 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -158,6 +158,8 @@ static struct s3c2410fb_display h1940_lcd __initdata = {
        .bpp =          16,
        .left_margin =  20,
        .right_margin = 8,
+       .upper_margin = 8,
+       .lower_margin = 7,
 };
 
 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 0a746f7..98fbca2 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -125,6 +125,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
                .bpp            = 16,
                .left_margin    = 44,
                .right_margin   = 116,
+               .upper_margin   = 19,
+               .lower_margin   = 11,
        },
        {
                /* Configuration for 480x640 toppoly TD028TTEC1 */
@@ -154,6 +156,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
                .bpp            = 16,
                .left_margin    = 8,
                .right_margin   = 24,
+               .upper_margin   = 2,
+               .lower_margin   = 4,
        },
        {
                /* Config for 240x320 LCD */
@@ -183,6 +187,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
                .bpp            = 16,
                .left_margin    = 13,
                .right_margin   = 8,
+               .upper_margin   = 2,
+               .lower_margin   = 7,
        },
 };
 

diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index 3058272..9f87465 100644 (file)
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -136,6 +136,8 @@ static struct s3c2410fb_display rx3715_lcdcfg __initdata = {
        .bpp            = 16,
        .left_margin    = 36,
        .right_margin   = 36,
+       .upper_margin   = 6,
+       .lower_margin   = 7,
 };
 
 static struct s3c2410fb_mach_info rx3715_fb_info __initdata = {

diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index 33b3644..f400eb7 100644 (file)
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -133,6 +133,8 @@ static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = {
        .bpp            = 16,
        .left_margin    = 20,
        .right_margin   = 8,
+       .upper_margin   = 8,
+       .lower_margin   = 7,
 };
 
 static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = {