Merge branch 'linux-2.6'

[linux-2.6-omap-h63xx.git] / arch / arm / mach-s3c2410 / mach-bast.c

diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index be50201809a19fd914076e7ee40740aef0cd2cca..66175471fff30492ebf45e8a4518b20af5915344 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -469,148 +469,58 @@ static struct platform_device bast_device_axpp = {
 
 static struct s3c2410fb_display __initdata bast_lcd_info[] = {
        {
-               .width          = 640,
-               .height         = 480,
-               .xres           = 320,
-               .yres           = 240,
-
-               .bpp            = 4,
-
-               .regs           = {
-                       .lcdcon1        = 0x00000176,
-                       .lcdcon2        = 0x1d77c7c2,
-                       .lcdcon3        = 0x013a7f13,
-                       .lcdcon4        = 0x00000057,
-                       .lcdcon5        = 0x00014b02,
-               }
-       },
-       {
+               .type           = S3C2410_LCDCON1_TFT,
                .width          = 640,
                .height         = 480,
 
+               .pixclock       = 33333,
                .xres           = 640,
                .yres           = 480,
                .bpp            = 4,
-
-               .regs           = {
-                       .lcdcon1        = 0x00000176,
-                       .lcdcon2        = 0x1d77c7c2,
-                       .lcdcon3        = 0x013a7f13,
-                       .lcdcon4        = 0x00000057,
-                       .lcdcon5        = 0x00014b02,
-               }
-       },
-       {
-               .width          = 640,
-               .height         = 480,
-
-               .xres           = 800,
-               .yres           = 600,
-               .bpp            = 4,
-
-               .regs           = {
-                       .lcdcon1        = 0x00000176,
-                       .lcdcon2        = 0x1d77c7c2,
-                       .lcdcon3        = 0x013a7f13,
-                       .lcdcon4        = 0x00000057,
-                       .lcdcon5        = 0x00014b02,
-               }
-       },
-       {
-               .width          = 640,
-               .height         = 480,
-
-               .xres           = 320,
-               .yres           = 240,
-               .bpp            = 8,
-
-               .regs           = {
-                       .lcdcon1        = 0x00000176,
-                       .lcdcon2        = 0x1d77c7c2,
-                       .lcdcon3        = 0x013a7f13,
-                       .lcdcon4        = 0x00000057,
-                       .lcdcon5        = 0x00014b02,
-               }
+               .left_margin    = 40,
+               .right_margin   = 20,
+               .hsync_len      = 88,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
+               .vsync_len      = 3,
+
+               .lcdcon5        = 0x00014b02,
        },
        {
+               .type           = S3C2410_LCDCON1_TFT,
                .width          = 640,
                .height         = 480,
 
+               .pixclock       = 33333,
                .xres           = 640,
                .yres           = 480,
                .bpp            = 8,
-
-               .regs           = {
-                       .lcdcon1        = 0x00000176,
-                       .lcdcon2        = 0x1d77c7c2,
-                       .lcdcon3        = 0x013a7f13,
-                       .lcdcon4        = 0x00000057,
-                       .lcdcon5        = 0x00014b02,
-               }
-       },
-       {
-               .width          = 640,
-               .height         = 480,
-
-               .xres           = 800,
-               .yres           = 600,
-               .bpp            = 8,
-
-               .regs           = {
-                       .lcdcon1        = 0x00000176,
-                       .lcdcon2        = 0x1d77c7c2,
-                       .lcdcon3        = 0x013a7f13,
-                       .lcdcon4        = 0x00000057,
-                       .lcdcon5        = 0x00014b02,
-               }
-       },
-       {
-               .width          = 640,
-               .height         = 480,
-
-               .xres           = 320,
-               .yres           = 240,
-               .bpp            = 16,
-
-               .regs           = {
-                       .lcdcon1        = 0x00000176,
-                       .lcdcon2        = 0x1d77c7c2,
-                       .lcdcon3        = 0x013a7f13,
-                       .lcdcon4        = 0x00000057,
-                       .lcdcon5        = 0x00014b02,
-               }
+               .left_margin    = 40,
+               .right_margin   = 20,
+               .hsync_len      = 88,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
+               .vsync_len      = 3,
+
+               .lcdcon5        = 0x00014b02,
        },
        {
+               .type           = S3C2410_LCDCON1_TFT,
                .width          = 640,
                .height         = 480,
 
+               .pixclock       = 33333,
                .xres           = 640,
                .yres           = 480,
                .bpp            = 16,
-
-               .regs           = {
-                       .lcdcon1        = 0x00000176,
-                       .lcdcon2        = 0x1d77c7c2,
-                       .lcdcon3        = 0x013a7f13,
-                       .lcdcon4        = 0x00000057,
-                       .lcdcon5        = 0x00014b02,
-               }
-       },
-       {
-               .width          = 640,
-               .height         = 480,
-
-               .xres           = 800,
-               .yres           = 600,
-               .bpp            = 16,
-
-               .regs           = {
-                       .lcdcon1        = 0x00000176,
-                       .lcdcon2        = 0x1d77c7c2,
-                       .lcdcon3        = 0x013a7f13,
-                       .lcdcon4        = 0x00000057,
-                       .lcdcon5        = 0x00014b02,
-               }
+               .left_margin    = 40,
+               .right_margin   = 20,
+               .hsync_len      = 88,
+               .upper_margin   = 30,
+               .lower_margin   = 32,
+               .vsync_len      = 3,
+
+               .lcdcon5        = 0x00014b02,
        },
 };
 
@@ -620,7 +530,7 @@ static struct s3c2410fb_mach_info __initdata bast_fb_info = {
 
        .displays = bast_lcd_info,
        .num_displays = ARRAY_SIZE(bast_lcd_info),
-       .default_display = 4,
+       .default_display = 1,
 };
 
 /* Standard BAST devices */
@@ -630,7 +540,6 @@ static struct platform_device *bast_devices[] __initdata = {
        &s3c_device_lcd,
        &s3c_device_wdt,
        &s3c_device_i2c,
-       &s3c_device_iis,
        &s3c_device_rtc,
        &s3c_device_nand,
        &bast_device_nor,