spi: spi_s3c24xx must initialize num_chipselect

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-s3c2410 / fb.h

diff --git a/include/asm-arm/arch-s3c2410/fb.h b/include/asm-arm/arch-s3c2410/fb.h
index 93a58e7862b050f6512d8249979e1b87caf083d4..5d0262601a7eb16cee5bbb316bc47f9d49e20767 100644 (file)
--- a/include/asm-arm/arch-s3c2410/fb.h
+++ b/include/asm-arm/arch-s3c2410/fb.h
@@ -14,12 +14,6 @@
 
 #include <asm/arch/regs-lcd.h>
 
-struct s3c2410fb_val {
-       unsigned int    defval;
-       unsigned int    min;
-       unsigned int    max;
-};
-
 struct s3c2410fb_hw {
        unsigned long   lcdcon1;
        unsigned long   lcdcon2;
@@ -28,23 +22,37 @@ struct s3c2410fb_hw {
        unsigned long   lcdcon5;
 };
 
-struct s3c2410fb_mach_info {
-       unsigned char   fixed_syncs;    /* do not update sync/border */
-
-       /* LCD types */
-       int             type;
+/* LCD description */
+struct s3c2410fb_display {
+       /* LCD type */
+       unsigned type;
 
        /* Screen size */
-       int             width;
-       int             height;
+       unsigned short width;
+       unsigned short height;
 
        /* Screen info */
-       struct s3c2410fb_val xres;
-       struct s3c2410fb_val yres;
-       struct s3c2410fb_val bpp;
+       unsigned short xres;
+       unsigned short yres;
+       unsigned short bpp;
+
+       unsigned pixclock;              /* pixclock in picoseconds */
+       unsigned short left_margin;  /* value in pixels (TFT) or HCLKs (STN) */
+       unsigned short right_margin; /* value in pixels (TFT) or HCLKs (STN) */
+       unsigned short hsync_len;    /* value in pixels (TFT) or HCLKs (STN) */
+       unsigned short upper_margin;    /* value in lines (TFT) or 0 (STN) */
+       unsigned short lower_margin;    /* value in lines (TFT) or 0 (STN) */
+       unsigned short vsync_len;       /* value in lines (TFT) or 0 (STN) */
 
        /* lcd configuration registers */
-       struct s3c2410fb_hw  regs;
+       unsigned long   lcdcon5;
+};
+
+struct s3c2410fb_mach_info {
+
+       struct s3c2410fb_display *displays;     /* attached diplays info */
+       unsigned num_displays;                  /* number of defined displays */
+       unsigned default_display;
 
        /* GPIOs */