Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

[mv-sheeva.git] / drivers / video / omap2 / displays / panel-generic-dpi.c

diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
index 9c90f75653fb3d262489d3c9e78f04282bd8d7e2..519c47d2057f8980f6370b9ef12deb0f7b6d2955 100644 (file)
--- a/drivers/video/omap2/displays/panel-generic-dpi.c
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -58,30 +58,6 @@ struct panel_config {
 
 /* Panel configurations */
 static struct panel_config generic_dpi_panels[] = {
-       /* Generic Panel */
-       {
-               {
-                       .x_res          = 640,
-                       .y_res          = 480,
-
-                       .pixel_clock    = 23500,
-
-                       .hfp            = 48,
-                       .hsw            = 32,
-                       .hbp            = 80,
-
-                       .vfp            = 3,
-                       .vsw            = 4,
-                       .vbp            = 7,
-               },
-               .acbi                   = 0x0,
-               .acb                    = 0x0,
-               .config                 = OMAP_DSS_LCD_TFT,
-               .power_on_delay         = 0,
-               .power_off_delay        = 0,
-               .name                   = "generic",
-       },
-
        /* Sharp LQ043T1DG01 */
        {
                {
@@ -232,6 +208,95 @@ static struct panel_config generic_dpi_panels[] = {
                .power_off_delay        = 0,
                .name                   = "powertip_ph480272t",
        },
+
+       /* Innolux AT070TN83 */
+       {
+               {
+                       .x_res          = 800,
+                       .y_res          = 480,
+
+                       .pixel_clock    = 40000,
+
+                       .hsw            = 48,
+                       .hfp            = 1,
+                       .hbp            = 1,
+
+                       .vsw            = 3,
+                       .vfp            = 12,
+                       .vbp            = 25,
+               },
+               .acbi                   = 0x0,
+               .acb                    = 0x28,
+               .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                         OMAP_DSS_LCD_IHS,
+               .power_on_delay         = 0,
+               .power_off_delay        = 0,
+               .name                   = "innolux_at070tn83",
+       },
+
+       /* NEC NL2432DR22-11B */
+       {
+               {
+                       .x_res          = 240,
+                       .y_res          = 320,
+
+                       .pixel_clock    = 5400,
+
+                       .hsw            = 3,
+                       .hfp            = 3,
+                       .hbp            = 39,
+
+                       .vsw            = 1,
+                       .vfp            = 2,
+                       .vbp            = 7,
+               },
+               .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                               OMAP_DSS_LCD_IHS,
+               .name                   = "nec_nl2432dr22-11b",
+       },
+
+       /* Unknown panel used in OMAP H4 */
+       {
+               {
+                       .x_res          = 240,
+                       .y_res          = 320,
+
+                       .pixel_clock    = 6250,
+
+                       .hsw            = 15,
+                       .hfp            = 15,
+                       .hbp            = 60,
+
+                       .vsw            = 1,
+                       .vfp            = 1,
+                       .vbp            = 1,
+               },
+               .config                 = OMAP_DSS_LCD_TFT,
+
+               .name                   = "h4",
+       },
+
+       /* Unknown panel used in Samsung OMAP2 Apollon */
+       {
+               {
+                       .x_res          = 480,
+                       .y_res          = 272,
+
+                       .pixel_clock    = 6250,
+
+                       .hsw            = 41,
+                       .hfp            = 2,
+                       .hbp            = 2,
+
+                       .vsw            = 10,
+                       .vfp            = 2,
+                       .vbp            = 2,
+               },
+               .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                               OMAP_DSS_LCD_IHS,
+
+               .name                   = "apollon",
+       },
 };
 
 struct panel_drv_data {