Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / avr32 / boards / mimc200 / setup.c

diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
index c1b2175..523d8e1 100644 (file)
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@ -43,16 +43,16 @@ unsigned long at32_board_osc_rates[3] = {
 /* Initialized by bootloader-specific startup code. */
 struct tag *bootloader_tags __initdata;
 
-static struct fb_videomode __initdata tx14d14_modes[] = {
+static struct fb_videomode __initdata pt0434827_modes[] = {
        {
-               .name           = "640x480 @ 60",
-               .refresh        = 60,
-               .xres           = 640,          .yres           = 480,
-               .pixclock       = KHZ2PICOS(11666),
+               .name           = "480x272 @ 72",
+               .refresh        = 72,
+               .xres           = 480,          .yres           = 272,
+               .pixclock       = KHZ2PICOS(10000),
 
-               .left_margin    = 80,           .right_margin   = 1,
-               .upper_margin   = 13,           .lower_margin   = 2,
-               .hsync_len      = 64,           .vsync_len      = 1,
+               .left_margin    = 1,            .right_margin   = 1,
+               .upper_margin   = 12,           .lower_margin   = 1,
+               .hsync_len      = 42,           .vsync_len      = 1,
 
                .sync           = 0,
                .vmode          = FB_VMODE_NONINTERLACED,
@@ -60,14 +60,14 @@ static struct fb_videomode __initdata tx14d14_modes[] = {
 };
 
 static struct fb_monspecs __initdata mimc200_default_monspecs = {
-       .manufacturer           = "HIT",
-       .monitor                = "TX14D14VM1BAB",
-       .modedb                 = tx14d14_modes,
-       .modedb_len             = ARRAY_SIZE(tx14d14_modes),
+       .manufacturer           = "PT",
+       .monitor                = "PT0434827-A401",
+       .modedb                 = pt0434827_modes,
+       .modedb_len             = ARRAY_SIZE(pt0434827_modes),
        .hfmin                  = 14820,
        .hfmax                  = 22230,
        .vfmin                  = 60,
-       .vfmax                  = 73.3,
+       .vfmax                  = 85,
        .dclkmax                = 25200000,
 };
 
@@ -228,7 +228,8 @@ static int __init mimc200_init(void)
        i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));
 
        at32_add_device_lcdc(0, &mimc200_lcdc_data,
-                            fbmem_start, fbmem_size, 1);
+                            fbmem_start, fbmem_size,
+                            ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_CONTROL | ATMEL_LCDC_ALT_24B_DATA);
 
        return 0;
 }