[ARM] Orion: catch a couple more alternative spellings of PCIe

[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 2919e6bf02afcc01a25249cdffa5de8e45b15cc2..4552828bf8000965c4dcc7d09905dcf36b5668c8 100644 (file)
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -105,29 +105,18 @@ 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,