s3c2410fb: remove lcdcon3 register from s3c2410fb_display

[safe/jmp/linux-2.6] / arch / arm / mach-s3c2410 / mach-qt2410.c

diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
index 0c1ff0a..0a746f7 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -98,30 +98,23 @@ static struct s3c2410_uartcfg smdk2410_uartcfgs[] = {
 static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
        {
                /* Configuration for 640x480 SHARP LQ080V3DG01 */
-               .regs   = {
+               .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
+                          S3C2410_LCDCON1_TFT |
+                          S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
 
-                       .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
-                                  S3C2410_LCDCON1_TFT |
-                                  S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
+               .lcdcon2 = S3C2410_LCDCON2_VBPD(18) |   /* 19 */
+                          S3C2410_LCDCON2_LINEVAL(479) |
+                          S3C2410_LCDCON2_VFPD(10) |   /* 11 */
+                          S3C2410_LCDCON2_VSPW(14),    /* 15 */
 
-                       .lcdcon2 = S3C2410_LCDCON2_VBPD(18) |   /* 19 */
-                                  S3C2410_LCDCON2_LINEVAL(479) |
-                                  S3C2410_LCDCON2_VFPD(10) |   /* 11 */
-                                  S3C2410_LCDCON2_VSPW(14),    /* 15 */
+               .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
+                          S3C2410_LCDCON4_HSPW(95),    /* 96 */
 
-                       .lcdcon3 = S3C2410_LCDCON3_HBPD(43) |   /* 44 */
-                                  S3C2410_LCDCON3_HOZVAL(639) | /* 640 */
-                                  S3C2410_LCDCON3_HFPD(115),   /* 116 */
-
-                       .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
-                                  S3C2410_LCDCON4_HSPW(95),    /* 96 */
-
-                       .lcdcon5 = S3C2410_LCDCON5_FRM565 |
-                                  S3C2410_LCDCON5_INVVLINE |
-                                  S3C2410_LCDCON5_INVVFRAME |
-                                  S3C2410_LCDCON5_PWREN |
-                                  S3C2410_LCDCON5_HWSWP,
-               },
+               .lcdcon5 = S3C2410_LCDCON5_FRM565 |
+                          S3C2410_LCDCON5_INVVLINE |
+                          S3C2410_LCDCON5_INVVFRAME |
+                          S3C2410_LCDCON5_PWREN |
+                          S3C2410_LCDCON5_HWSWP,
 
                .type           = S3C2410_LCDCON1_TFT,
                .width          = 640,
@@ -135,30 +128,23 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
        },
        {
                /* Configuration for 480x640 toppoly TD028TTEC1 */
-               .regs   = {
-
-                       .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
-                                  S3C2410_LCDCON1_TFT |
-                                  S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
-
-                       .lcdcon2 = S3C2410_LCDCON2_VBPD(1) |    /* 2 */
-                                  S3C2410_LCDCON2_LINEVAL(639) |/* 640 */
-                                  S3C2410_LCDCON2_VFPD(3) |    /* 4 */
-                                  S3C2410_LCDCON2_VSPW(1),     /* 2 */
+               .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
+                          S3C2410_LCDCON1_TFT |
+                          S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
 
-                       .lcdcon3 = S3C2410_LCDCON3_HBPD(7) |    /* 8 */
-                                  S3C2410_LCDCON3_HOZVAL(479) | /* 479 */
-                                  S3C2410_LCDCON3_HFPD(23),    /* 24 */
+               .lcdcon2 = S3C2410_LCDCON2_VBPD(1) |    /* 2 */
+                          S3C2410_LCDCON2_LINEVAL(639) |/* 640 */
+                          S3C2410_LCDCON2_VFPD(3) |    /* 4 */
+                          S3C2410_LCDCON2_VSPW(1),     /* 2 */
 
-                       .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
-                                  S3C2410_LCDCON4_HSPW(7),     /* 8 */
+               .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
+                          S3C2410_LCDCON4_HSPW(7),     /* 8 */
 
-                       .lcdcon5 = S3C2410_LCDCON5_FRM565 |
-                                  S3C2410_LCDCON5_INVVLINE |
-                                  S3C2410_LCDCON5_INVVFRAME |
-                                  S3C2410_LCDCON5_PWREN |
-                                  S3C2410_LCDCON5_HWSWP,
-               },
+               .lcdcon5 = S3C2410_LCDCON5_FRM565 |
+                          S3C2410_LCDCON5_INVVLINE |
+                          S3C2410_LCDCON5_INVVFRAME |
+                          S3C2410_LCDCON5_PWREN |
+                          S3C2410_LCDCON5_HWSWP,
 
                .type           = S3C2410_LCDCON1_TFT,
                .width          = 480,
@@ -171,30 +157,23 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
        },
        {
                /* Config for 240x320 LCD */
-               .regs   = {
-
-                       .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
-                                  S3C2410_LCDCON1_TFT |
-                                  S3C2410_LCDCON1_CLKVAL(0x04),
-
-                       .lcdcon2 = S3C2410_LCDCON2_VBPD(1) |
-                                  S3C2410_LCDCON2_LINEVAL(319) |
-                                  S3C2410_LCDCON2_VFPD(6) |
-                                  S3C2410_LCDCON2_VSPW(3),
-
-                       .lcdcon3 = S3C2410_LCDCON3_HBPD(12) |
-                                  S3C2410_LCDCON3_HOZVAL(239) |
-                                  S3C2410_LCDCON3_HFPD(7),
-
-                       .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
-                                  S3C2410_LCDCON4_HSPW(3),
-
-                       .lcdcon5 = S3C2410_LCDCON5_FRM565 |
-                                  S3C2410_LCDCON5_INVVLINE |
-                                  S3C2410_LCDCON5_INVVFRAME |
-                                  S3C2410_LCDCON5_PWREN |
-                                  S3C2410_LCDCON5_HWSWP,
-               },
+               .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
+                          S3C2410_LCDCON1_TFT |
+                          S3C2410_LCDCON1_CLKVAL(0x04),
+
+               .lcdcon2 = S3C2410_LCDCON2_VBPD(1) |
+                          S3C2410_LCDCON2_LINEVAL(319) |
+                          S3C2410_LCDCON2_VFPD(6) |
+                          S3C2410_LCDCON2_VSPW(3),
+
+               .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
+                          S3C2410_LCDCON4_HSPW(3),
+
+               .lcdcon5 = S3C2410_LCDCON5_FRM565 |
+                          S3C2410_LCDCON5_INVVLINE |
+                          S3C2410_LCDCON5_INVVFRAME |
+                          S3C2410_LCDCON5_PWREN |
+                          S3C2410_LCDCON5_HWSWP,
 
                .type           = S3C2410_LCDCON1_TFT,
                .width          = 240,