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

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

diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index 9f874658a60dfb79cf10cba60682d84d159c9315..a4c690456d19a40f3ffcb72a08905f2292cb429c 100644 (file)
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
-
+#include <linux/io.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ecc.h>
@@ -33,18 +33,17 @@
 #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/h1940.h>
+#include <mach/h1940.h>
 #include <asm/plat-s3c/nand.h>
-#include <asm/arch/fb.h>
+#include <mach/fb.h>
 
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/devs.h>
@@ -111,18 +110,6 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
 /* framebuffer lcd controller information */
 
 static struct s3c2410fb_display rx3715_lcdcfg __initdata = {
-       .lcdcon1 =      S3C2410_LCDCON1_TFT16BPP | \
-                       S3C2410_LCDCON1_TFT | \
-                       S3C2410_LCDCON1_CLKVAL(0x0C),
-
-       .lcdcon2 =      S3C2410_LCDCON2_VBPD(5) | \
-                       S3C2410_LCDCON2_LINEVAL(319) | \
-                       S3C2410_LCDCON2_VFPD(6) | \
-                       S3C2410_LCDCON2_VSPW(2),
-
-       .lcdcon4 =      S3C2410_LCDCON4_MVAL(0) | \
-                       S3C2410_LCDCON4_HSPW(7),
-
        .lcdcon5 =      S3C2410_LCDCON5_INVVLINE |
                        S3C2410_LCDCON5_FRM565 |
                        S3C2410_LCDCON5_HWSWP,
@@ -131,13 +118,16 @@ static struct s3c2410fb_display rx3715_lcdcfg __initdata = {
        .width          = 240,
        .height         = 320,
 
+       .pixclock       = 260000,
        .xres           = 240,
        .yres           = 320,
        .bpp            = 16,
        .left_margin    = 36,
        .right_margin   = 36,
+       .hsync_len      = 8,
        .upper_margin   = 6,
        .lower_margin   = 7,
+       .vsync_len      = 3,
 };
 
 static struct s3c2410fb_mach_info rx3715_fb_info __initdata = {
@@ -157,8 +147,6 @@ static struct s3c2410fb_mach_info rx3715_fb_info __initdata = {
        .gpdcon_mask =  0xffc0fff0,
        .gpdup =        0x0000faff,
        .gpdup_mask =   0xffffffff,
-
-       .fixed_syncs =  1,
 };
 
 static struct mtd_partition rx3715_nand_part[] = {