4 files changed, 17 insertions, 18 deletions

diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile
index 0b97e14f73f6..c21a3290d542 100644
--- a/arch/avr32/Makefile
+++ b/arch/avr32/Makefile
@@ -43,8 +43,6 @@ core-y					+= arch/avr32/mm/
 drivers-$(CONFIG_OPROFILE)              += arch/avr32/oprofile/
 libs-y                                  += arch/avr32/lib/
 
-CLEAN_FILES += include/asm-avr32/.arch include/asm-avr32/arch
-
 BOOT_TARGETS := vmlinux.elf vmlinux.bin uImage uImage.srec
 
 .PHONY: $(BOOT_TARGETS) install
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
index c1b2175b4fea..523d8e183bef 100644
--- 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;
 }
diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c
index 0ff46bf873b0..f27aa3b259fa 100644
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
@@ -18,7 +18,7 @@
 #include <mach/pm.h>
 
 
-static cycle_t read_cycle_count(void)
+static cycle_t read_cycle_count(struct clocksource *cs)
 {
         return (cycle_t)sysreg_read(COUNT);
 }
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index 0b8164281899..ddedb471f33e 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -29,7 +29,7 @@ extern struct platform_device *atmel_default_console_device;
 /* Flags for selecting USART extra pins */
 #define ATMEL_USART_RTS         0x01
 #define ATMEL_USART_CTS         0x02
-#define ATMEL_USART_CLK         0x03
+#define ATMEL_USART_CLK         0x04
 
 struct atmel_uart_data {
         short           use_dma_tx;     /* use transmit DMA? */