[ARM] Convert asm/io.h to linux/io.h

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

diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 1c9d6c69b712b85ea00e92699be9985ad637a647..85e710f2863b37ec9a3edf21df100741f96c1f4a 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -20,24 +20,24 @@
 #include <linux/sysdev.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/hardware.h>
-#include <asm/io.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-clock.h>
 
-#include <asm/arch/h1940.h>
-#include <asm/arch/h1940-latch.h>
-#include <asm/arch/fb.h>
+#include <mach/h1940.h>
+#include <mach/h1940-latch.h>
+#include <mach/fb.h>
 #include <asm/plat-s3c24xx/udc.h>
 
 #include <asm/plat-s3c24xx/clock.h>
@@ -134,18 +134,6 @@ static struct s3c2410_udc_mach_info h1940_udc_cfg __initdata = {
  * Set lcd on or off
  **/
 static struct s3c2410fb_display h1940_lcd __initdata = {
-       .lcdcon1=       S3C2410_LCDCON1_TFT16BPP | \
-                       S3C2410_LCDCON1_TFT | \
-                       S3C2410_LCDCON1_CLKVAL(0x0C),
-
-       .lcdcon2=       S3C2410_LCDCON2_VBPD(7) | \
-                       S3C2410_LCDCON2_LINEVAL(319) | \
-                       S3C2410_LCDCON2_VFPD(6) | \
-                       S3C2410_LCDCON2_VSPW(0),
-
-       .lcdcon4=       S3C2410_LCDCON4_MVAL(0) | \
-                       S3C2410_LCDCON4_HSPW(3),
-
        .lcdcon5=       S3C2410_LCDCON5_FRM565 | \
                        S3C2410_LCDCON5_INVVLINE | \
                        S3C2410_LCDCON5_HWSWP,
@@ -153,18 +141,19 @@ static struct s3c2410fb_display h1940_lcd __initdata = {
        .type =         S3C2410_LCDCON1_TFT,
        .width =        240,
        .height =       320,
+       .pixclock =     260000,
        .xres =         240,
        .yres =         320,
        .bpp =          16,
        .left_margin =  20,
        .right_margin = 8,
+       .hsync_len =    4,
        .upper_margin = 8,
        .lower_margin = 7,
+       .vsync_len =    1,
 };
 
 static struct s3c2410fb_mach_info h1940_fb_info __initdata = {
-       .fixed_syncs =          1,
-
        .displays = &h1940_lcd,
        .num_displays = 1,
        .default_display = 0,