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

[linux-2.6-omap-h63xx.git] / arch / arm / mach-s3c2440 / mach-smdk2440.c

diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index 33b364476c1861035df905d7edc4d9e510f061cd..7ac60b869e7fde7dfe708b1972072102b9359ee6 100644 (file)
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -21,22 +21,22 @@
 #include <linux/init.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-gpio.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-lcd.h>
 
-#include <asm/arch/idle.h>
-#include <asm/arch/fb.h>
+#include <mach/idle.h>
+#include <mach/fb.h>
 
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/s3c2440.h>
@@ -105,34 +105,27 @@ static struct s3c2410_uartcfg smdk2440_uartcfgs[] __initdata = {
 
 static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = {
 
-       .lcdcon1        = S3C2410_LCDCON1_TFT16BPP |
-                         S3C2410_LCDCON1_TFT |
-                         S3C2410_LCDCON1_CLKVAL(0x04),
-
-       .lcdcon2        = S3C2410_LCDCON2_VBPD(7) |
-                         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_TFT16BPP,
+       .type           = S3C2410_LCDCON1_TFT,
 
        .width          = 240,
        .height         = 320,
 
+       .pixclock       = 166667, /* HCLK 60 MHz, divisor 10 */
        .xres           = 240,
        .yres           = 320,
        .bpp            = 16,
        .left_margin    = 20,
        .right_margin   = 8,
+       .hsync_len      = 4,
+       .upper_margin   = 8,
+       .lower_margin   = 7,
+       .vsync_len      = 4,
 };
 
 static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = {