aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-10-16 04:29:07 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:18 -0400
commit36f31a7084b8d20ced37afe92238c18ba769cdf3 (patch)
tree89cbf11b468c2083666f9f981452b982678012db /arch
parent69816699fa019145dd163949d65a07093af73b67 (diff)
s3c2410fb: removes lcdcon1 register value from s3c2410fb_display
This patch removes lcdcon1 register field from the s3c2410fb_display as all bits are calculated from other fields. 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')
-rw-r--r--arch/arm/mach-s3c2410/mach-amlm5900.c1
-rw-r--r--arch/arm/mach-s3c2410/mach-bast.c3
-rw-r--r--arch/arm/mach-s3c2410/mach-h1940.c4
-rw-r--r--arch/arm/mach-s3c2410/mach-qt2410.c12
-rw-r--r--arch/arm/mach-s3c2440/mach-rx3715.c4
-rw-r--r--arch/arm/mach-s3c2440/mach-smdk2440.c4
6 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index a86d68d22a72..a67a0685664d 100644
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -184,7 +184,6 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = {
184 .upper_margin = 0, 184 .upper_margin = 0,
185 .lower_margin = 0, 185 .lower_margin = 0,
186 186
187 .lcdcon1 = 0x00008225,
188 .lcdcon5 = 0x00000001, 187 .lcdcon5 = 0x00000001,
189}; 188};
190 189
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 103fc5724735..587864fe25fb 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -484,7 +484,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
484 .lower_margin = 32, 484 .lower_margin = 32,
485 .vsync_len = 3, 485 .vsync_len = 3,
486 486
487 .lcdcon1 = 0x00000176,
488 .lcdcon5 = 0x00014b02, 487 .lcdcon5 = 0x00014b02,
489 }, 488 },
490 { 489 {
@@ -503,7 +502,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
503 .lower_margin = 32, 502 .lower_margin = 32,
504 .vsync_len = 3, 503 .vsync_len = 3,
505 504
506 .lcdcon1 = 0x00000176,
507 .lcdcon5 = 0x00014b02, 505 .lcdcon5 = 0x00014b02,
508 }, 506 },
509 { 507 {
@@ -522,7 +520,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
522 .lower_margin = 32, 520 .lower_margin = 32,
523 .vsync_len = 3, 521 .vsync_len = 3,
524 522
525 .lcdcon1 = 0x00000176,
526 .lcdcon5 = 0x00014b02, 523 .lcdcon5 = 0x00014b02,
527 }, 524 },
528}; 525};
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 8a508428a9e5..7c1145e87c12 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -134,10 +134,6 @@ static struct s3c2410_udc_mach_info h1940_udc_cfg __initdata = {
134 * Set lcd on or off 134 * Set lcd on or off
135 **/ 135 **/
136static struct s3c2410fb_display h1940_lcd __initdata = { 136static struct s3c2410fb_display h1940_lcd __initdata = {
137 .lcdcon1= S3C2410_LCDCON1_TFT16BPP | \
138 S3C2410_LCDCON1_TFT | \
139 S3C2410_LCDCON1_CLKVAL(0x0C),
140
141 .lcdcon5= S3C2410_LCDCON5_FRM565 | \ 137 .lcdcon5= S3C2410_LCDCON5_FRM565 | \
142 S3C2410_LCDCON5_INVVLINE | \ 138 S3C2410_LCDCON5_INVVLINE | \
143 S3C2410_LCDCON5_HWSWP, 139 S3C2410_LCDCON5_HWSWP,
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
index 612f62469525..a1caf4b0adac 100644
--- a/arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -98,10 +98,6 @@ static struct s3c2410_uartcfg smdk2410_uartcfgs[] = {
98static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 98static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
99 { 99 {
100 /* Configuration for 640x480 SHARP LQ080V3DG01 */ 100 /* Configuration for 640x480 SHARP LQ080V3DG01 */
101 .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
102 S3C2410_LCDCON1_TFT |
103 S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
104
105 .lcdcon5 = S3C2410_LCDCON5_FRM565 | 101 .lcdcon5 = S3C2410_LCDCON5_FRM565 |
106 S3C2410_LCDCON5_INVVLINE | 102 S3C2410_LCDCON5_INVVLINE |
107 S3C2410_LCDCON5_INVVFRAME | 103 S3C2410_LCDCON5_INVVFRAME |
@@ -125,10 +121,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
125 }, 121 },
126 { 122 {
127 /* Configuration for 480x640 toppoly TD028TTEC1 */ 123 /* Configuration for 480x640 toppoly TD028TTEC1 */
128 .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
129 S3C2410_LCDCON1_TFT |
130 S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
131
132 .lcdcon5 = S3C2410_LCDCON5_FRM565 | 124 .lcdcon5 = S3C2410_LCDCON5_FRM565 |
133 S3C2410_LCDCON5_INVVLINE | 125 S3C2410_LCDCON5_INVVLINE |
134 S3C2410_LCDCON5_INVVFRAME | 126 S3C2410_LCDCON5_INVVFRAME |
@@ -151,10 +143,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
151 }, 143 },
152 { 144 {
153 /* Config for 240x320 LCD */ 145 /* Config for 240x320 LCD */
154 .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
155 S3C2410_LCDCON1_TFT |
156 S3C2410_LCDCON1_CLKVAL(0x04),
157
158 .lcdcon5 = S3C2410_LCDCON5_FRM565 | 146 .lcdcon5 = S3C2410_LCDCON5_FRM565 |
159 S3C2410_LCDCON5_INVVLINE | 147 S3C2410_LCDCON5_INVVLINE |
160 S3C2410_LCDCON5_INVVFRAME | 148 S3C2410_LCDCON5_INVVFRAME |
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index 408337f8bebf..bac40c4878a5 100644
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -111,10 +111,6 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
111/* framebuffer lcd controller information */ 111/* framebuffer lcd controller information */
112 112
113static struct s3c2410fb_display rx3715_lcdcfg __initdata = { 113static struct s3c2410fb_display rx3715_lcdcfg __initdata = {
114 .lcdcon1 = S3C2410_LCDCON1_TFT16BPP | \
115 S3C2410_LCDCON1_TFT | \
116 S3C2410_LCDCON1_CLKVAL(0x0C),
117
118 .lcdcon5 = S3C2410_LCDCON5_INVVLINE | 114 .lcdcon5 = S3C2410_LCDCON5_INVVLINE |
119 S3C2410_LCDCON5_FRM565 | 115 S3C2410_LCDCON5_FRM565 |
120 S3C2410_LCDCON5_HWSWP, 116 S3C2410_LCDCON5_HWSWP,
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index 561e39147e67..4552828bf800 100644
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -105,10 +105,6 @@ static struct s3c2410_uartcfg smdk2440_uartcfgs[] __initdata = {
105 105
106static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = { 106static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = {
107 107
108 .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
109 S3C2410_LCDCON1_TFT |
110 S3C2410_LCDCON1_CLKVAL(0x04),
111
112 .lcdcon5 = S3C2410_LCDCON5_FRM565 | 108 .lcdcon5 = S3C2410_LCDCON5_FRM565 |
113 S3C2410_LCDCON5_INVVLINE | 109 S3C2410_LCDCON5_INVVLINE |
114 S3C2410_LCDCON5_INVVFRAME | 110 S3C2410_LCDCON5_INVVFRAME |