[ARM] S3C24XX: Additional include moves

[deliverable/linux.git] / arch / arm / mach-s3c2410 / mach-qt2410.c

diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
index 50c0939a2492055ec61f8dc17b238a41ff470ee0..53ad949ef6c241b4e6bd473fcb501afd4e2f224e 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -42,24 +42,24 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/leds-gpio.h>
-#include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/fb.h>
+#include <mach/regs-gpio.h>
+#include <mach/leds-gpio.h>
+#include <plat/regs-serial.h>
+#include <mach/fb.h>
 #include <asm/plat-s3c/nand.h>
 #include <asm/plat-s3c24xx/udc.h>
-#include <asm/arch/spi.h>
-#include <asm/arch/spi-gpio.h>
+#include <mach/spi.h>
+#include <mach/spi-gpio.h>
 
-#include <asm/plat-s3c24xx/common-smdk.h>
-#include <asm/plat-s3c24xx/devs.h>
-#include <asm/plat-s3c24xx/cpu.h>
-#include <asm/plat-s3c24xx/pm.h>
+#include <plat/common-smdk.h>
+#include <plat/devs.h>
+#include <plat/cpu.h>
+#include <plat/pm.h>
 
 static struct map_desc qt2410_iodesc[] __initdata = {
        { 0xe0000000, __phys_to_pfn(S3C2410_CS3+0x01000000), SZ_1M, MT_DEVICE }
@@ -98,18 +98,6 @@ static struct s3c2410_uartcfg smdk2410_uartcfgs[] = {
 static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
        {
                /* Configuration for 640x480 SHARP LQ080V3DG01 */
-               .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
-                          S3C2410_LCDCON1_TFT |
-                          S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
-
-               .lcdcon2 = S3C2410_LCDCON2_VBPD(18) |   /* 19 */
-                          S3C2410_LCDCON2_LINEVAL(479) |
-                          S3C2410_LCDCON2_VFPD(10) |   /* 11 */
-                          S3C2410_LCDCON2_VSPW(14),    /* 15 */
-
-               .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
-                          S3C2410_LCDCON4_HSPW(95),    /* 96 */
-
                .lcdcon5 = S3C2410_LCDCON5_FRM565 |
                           S3C2410_LCDCON5_INVVLINE |
                           S3C2410_LCDCON5_INVVFRAME |
@@ -120,6 +108,7 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
                .width          = 640,
                .height         = 480,
 
+               .pixclock       = 40000, /* HCLK/4 */
                .xres           = 640,
                .yres           = 480,
                .bpp            = 16,
@@ -132,18 +121,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
        },
        {
                /* Configuration for 480x640 toppoly TD028TTEC1 */
-               .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
-                          S3C2410_LCDCON1_TFT |
-                          S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
-
-               .lcdcon2 = S3C2410_LCDCON2_VBPD(1) |    /* 2 */
-                          S3C2410_LCDCON2_LINEVAL(639) |/* 640 */
-                          S3C2410_LCDCON2_VFPD(3) |    /* 4 */
-                          S3C2410_LCDCON2_VSPW(1),     /* 2 */
-
-               .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
-                          S3C2410_LCDCON4_HSPW(7),     /* 8 */
-
                .lcdcon5 = S3C2410_LCDCON5_FRM565 |
                           S3C2410_LCDCON5_INVVLINE |
                           S3C2410_LCDCON5_INVVFRAME |
@@ -153,6 +130,7 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
                .type           = S3C2410_LCDCON1_TFT,
                .width          = 480,
                .height         = 640,
+               .pixclock       = 40000, /* HCLK/4 */
                .xres           = 480,
                .yres           = 640,
                .bpp            = 16,
@@ -165,18 +143,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
        },
        {
                /* Config for 240x320 LCD */
-               .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
-                          S3C2410_LCDCON1_TFT |
-                          S3C2410_LCDCON1_CLKVAL(0x04),
-
-               .lcdcon2 = S3C2410_LCDCON2_VBPD(1) |
-                          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 |
@@ -186,6 +152,7 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
                .type           = S3C2410_LCDCON1_TFT,
                .width          = 240,
                .height         = 320,
+               .pixclock       = 100000, /* HCLK/10 */
                .xres           = 240,
                .yres           = 320,
                .bpp            = 16,