diff options
-rw-r--r-- | arch/arm/mach-s3c2410/mach-amlm5900.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 19 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-qt2410.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-rx3715.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-smdk2440.c | 2 |
6 files changed, 33 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c index 74801ce022c1..5f51a80fcd5c 100644 --- 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 = { | |||
179 | .bpp = 4, | 179 | .bpp = 4, |
180 | .left_margin = 1 << (4 + 3), | 180 | .left_margin = 1 << (4 + 3), |
181 | .right_margin = 8 << 3, | 181 | .right_margin = 8 << 3, |
182 | .upper_margin = 0, | ||
183 | .lower_margin = 0, | ||
182 | 184 | ||
183 | .lcdcon1 = 0x00008225, | 185 | .lcdcon1 = 0x00008225, |
184 | .lcdcon2 = 0x0027c000, | 186 | .lcdcon2 = 0x0027c000, |
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 6e46c20b648c..7b54f3c2a2d7 100644 --- 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[] = { | |||
472 | .type = S3C2410_LCDCON1_TFT, | 472 | .type = S3C2410_LCDCON1_TFT, |
473 | .width = 640, | 473 | .width = 640, |
474 | .height = 480, | 474 | .height = 480, |
475 | |||
475 | .xres = 320, | 476 | .xres = 320, |
476 | .yres = 240, | 477 | .yres = 240, |
477 | .left_margin = 40, | 478 | .left_margin = 40, |
478 | .right_margin = 20, | 479 | .right_margin = 20, |
480 | .upper_margin = 30, | ||
481 | .lower_margin = 32, | ||
479 | 482 | ||
480 | .bpp = 4, | 483 | .bpp = 4, |
481 | 484 | ||
@@ -494,6 +497,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { | |||
494 | .bpp = 4, | 497 | .bpp = 4, |
495 | .left_margin = 40, | 498 | .left_margin = 40, |
496 | .right_margin = 20, | 499 | .right_margin = 20, |
500 | .upper_margin = 30, | ||
501 | .lower_margin = 32, | ||
497 | 502 | ||
498 | .lcdcon1 = 0x00000176, | 503 | .lcdcon1 = 0x00000176, |
499 | .lcdcon2 = 0x1d77c7c2, | 504 | .lcdcon2 = 0x1d77c7c2, |
@@ -510,6 +515,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { | |||
510 | .bpp = 4, | 515 | .bpp = 4, |
511 | .left_margin = 40, | 516 | .left_margin = 40, |
512 | .right_margin = 20, | 517 | .right_margin = 20, |
518 | .upper_margin = 30, | ||
519 | .lower_margin = 32, | ||
513 | 520 | ||
514 | .lcdcon1 = 0x00000176, | 521 | .lcdcon1 = 0x00000176, |
515 | .lcdcon2 = 0x1d77c7c2, | 522 | .lcdcon2 = 0x1d77c7c2, |
@@ -526,6 +533,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { | |||
526 | .bpp = 8, | 533 | .bpp = 8, |
527 | .left_margin = 40, | 534 | .left_margin = 40, |
528 | .right_margin = 20, | 535 | .right_margin = 20, |
536 | .upper_margin = 30, | ||
537 | .lower_margin = 32, | ||
529 | 538 | ||
530 | .lcdcon1 = 0x00000176, | 539 | .lcdcon1 = 0x00000176, |
531 | .lcdcon2 = 0x1d77c7c2, | 540 | .lcdcon2 = 0x1d77c7c2, |
@@ -542,6 +551,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { | |||
542 | .bpp = 8, | 551 | .bpp = 8, |
543 | .left_margin = 40, | 552 | .left_margin = 40, |
544 | .right_margin = 20, | 553 | .right_margin = 20, |
554 | .upper_margin = 30, | ||
555 | .lower_margin = 32, | ||
545 | 556 | ||
546 | .lcdcon1 = 0x00000176, | 557 | .lcdcon1 = 0x00000176, |
547 | .lcdcon2 = 0x1d77c7c2, | 558 | .lcdcon2 = 0x1d77c7c2, |
@@ -558,6 +569,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { | |||
558 | .bpp = 8, | 569 | .bpp = 8, |
559 | .left_margin = 40, | 570 | .left_margin = 40, |
560 | .right_margin = 20, | 571 | .right_margin = 20, |
572 | .upper_margin = 30, | ||
573 | .lower_margin = 32, | ||
561 | 574 | ||
562 | .lcdcon1 = 0x00000176, | 575 | .lcdcon1 = 0x00000176, |
563 | .lcdcon2 = 0x1d77c7c2, | 576 | .lcdcon2 = 0x1d77c7c2, |
@@ -574,6 +587,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { | |||
574 | .bpp = 16, | 587 | .bpp = 16, |
575 | .left_margin = 40, | 588 | .left_margin = 40, |
576 | .right_margin = 20, | 589 | .right_margin = 20, |
590 | .upper_margin = 30, | ||
591 | .lower_margin = 32, | ||
577 | 592 | ||
578 | .lcdcon1 = 0x00000176, | 593 | .lcdcon1 = 0x00000176, |
579 | .lcdcon2 = 0x1d77c7c2, | 594 | .lcdcon2 = 0x1d77c7c2, |
@@ -590,6 +605,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { | |||
590 | .bpp = 16, | 605 | .bpp = 16, |
591 | .left_margin = 40, | 606 | .left_margin = 40, |
592 | .right_margin = 20, | 607 | .right_margin = 20, |
608 | .upper_margin = 30, | ||
609 | .lower_margin = 32, | ||
593 | 610 | ||
594 | .lcdcon1 = 0x00000176, | 611 | .lcdcon1 = 0x00000176, |
595 | .lcdcon2 = 0x1d77c7c2, | 612 | .lcdcon2 = 0x1d77c7c2, |
@@ -606,6 +623,8 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { | |||
606 | .bpp = 16, | 623 | .bpp = 16, |
607 | .left_margin = 40, | 624 | .left_margin = 40, |
608 | .right_margin = 20, | 625 | .right_margin = 20, |
626 | .upper_margin = 30, | ||
627 | .lower_margin = 32, | ||
609 | 628 | ||
610 | .lcdcon1 = 0x00000176, | 629 | .lcdcon1 = 0x00000176, |
611 | .lcdcon2 = 0x1d77c7c2, | 630 | .lcdcon2 = 0x1d77c7c2, |
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 52d7685180c4..1c9d6c69b712 100644 --- 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 = { | |||
158 | .bpp = 16, | 158 | .bpp = 16, |
159 | .left_margin = 20, | 159 | .left_margin = 20, |
160 | .right_margin = 8, | 160 | .right_margin = 8, |
161 | .upper_margin = 8, | ||
162 | .lower_margin = 7, | ||
161 | }; | 163 | }; |
162 | 164 | ||
163 | static struct s3c2410fb_mach_info h1940_fb_info __initdata = { | 165 | 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 0a746f7f639f..98fbca2b7c20 100644 --- 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 = { | |||
125 | .bpp = 16, | 125 | .bpp = 16, |
126 | .left_margin = 44, | 126 | .left_margin = 44, |
127 | .right_margin = 116, | 127 | .right_margin = 116, |
128 | .upper_margin = 19, | ||
129 | .lower_margin = 11, | ||
128 | }, | 130 | }, |
129 | { | 131 | { |
130 | /* Configuration for 480x640 toppoly TD028TTEC1 */ | 132 | /* Configuration for 480x640 toppoly TD028TTEC1 */ |
@@ -154,6 +156,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { | |||
154 | .bpp = 16, | 156 | .bpp = 16, |
155 | .left_margin = 8, | 157 | .left_margin = 8, |
156 | .right_margin = 24, | 158 | .right_margin = 24, |
159 | .upper_margin = 2, | ||
160 | .lower_margin = 4, | ||
157 | }, | 161 | }, |
158 | { | 162 | { |
159 | /* Config for 240x320 LCD */ | 163 | /* Config for 240x320 LCD */ |
@@ -183,6 +187,8 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { | |||
183 | .bpp = 16, | 187 | .bpp = 16, |
184 | .left_margin = 13, | 188 | .left_margin = 13, |
185 | .right_margin = 8, | 189 | .right_margin = 8, |
190 | .upper_margin = 2, | ||
191 | .lower_margin = 7, | ||
186 | }, | 192 | }, |
187 | }; | 193 | }; |
188 | 194 | ||
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index 305827242bec..9f874658a60d 100644 --- 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 = { | |||
136 | .bpp = 16, | 136 | .bpp = 16, |
137 | .left_margin = 36, | 137 | .left_margin = 36, |
138 | .right_margin = 36, | 138 | .right_margin = 36, |
139 | .upper_margin = 6, | ||
140 | .lower_margin = 7, | ||
139 | }; | 141 | }; |
140 | 142 | ||
141 | static struct s3c2410fb_mach_info rx3715_fb_info __initdata = { | 143 | 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 33b364476c18..f400eb7df5a8 100644 --- 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 = { | |||
133 | .bpp = 16, | 133 | .bpp = 16, |
134 | .left_margin = 20, | 134 | .left_margin = 20, |
135 | .right_margin = 8, | 135 | .right_margin = 8, |
136 | .upper_margin = 8, | ||
137 | .lower_margin = 7, | ||
136 | }; | 138 | }; |
137 | 139 | ||
138 | static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = { | 140 | static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = { |