OMAPDSS: Port the Apollon display driver to DSS2
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 20 Apr 2011 07:47:28 +0000 (10:47 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 30 Sep 2011 13:17:29 +0000 (16:17 +0300)
Port the old omapfb panel driver for Apollon to DSS2.

Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/omap/Makefile
drivers/video/omap/lcd_apollon.c [deleted file]
drivers/video/omap2/displays/panel-generic-dpi.c

index 22fef616368fffc25fdad098b97e5927a1eed6cc..ef78550917ffd8ea0a5eb26bcb9b04e56d331b50 100644 (file)
@@ -25,7 +25,6 @@ objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o
 objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o
 objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o
 
-objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o
 objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o
 objs-y$(CONFIG_MACH_HERALD) += lcd_htcherald.o
 
diff --git a/drivers/video/omap/lcd_apollon.c b/drivers/video/omap/lcd_apollon.c
deleted file mode 100644 (file)
index 10459d8..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * LCD panel support for the Samsung OMAP2 Apollon board
- *
- * Copyright (C) 2005,2006 Samsung Electronics
- * Author: Kyungmin Park <kyungmin.park@samsung.com>
- *
- * Derived from drivers/video/omap/lcd-h4.c
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <linux/module.h>
-#include <linux/platform_device.h>
-
-#include <mach/gpio.h>
-
-#include "omapfb.h"
-
-/* #define USE_35INCH_LCD 1 */
-
-static int apollon_panel_init(struct lcd_panel *panel,
-                               struct omapfb_device *fbdev)
-{
-       return 0;
-}
-
-static void apollon_panel_cleanup(struct lcd_panel *panel)
-{
-}
-
-static int apollon_panel_enable(struct lcd_panel *panel)
-{
-       return 0;
-}
-
-static void apollon_panel_disable(struct lcd_panel *panel)
-{
-}
-
-static unsigned long apollon_panel_get_caps(struct lcd_panel *panel)
-{
-       return 0;
-}
-
-struct lcd_panel apollon_panel = {
-       .name           = "apollon",
-       .config         = OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC |
-                         OMAP_LCDC_INV_HSYNC,
-
-       .bpp            = 16,
-       .data_lines     = 18,
-#ifdef USE_35INCH_LCD
-       .x_res          = 240,
-       .y_res          = 320,
-       .hsw            = 2,
-       .hfp            = 3,
-       .hbp            = 9,
-       .vsw            = 4,
-       .vfp            = 3,
-       .vbp            = 5,
-#else
-       .x_res          = 480,
-       .y_res          = 272,
-       .hsw            = 41,
-       .hfp            = 2,
-       .hbp            = 2,
-       .vsw            = 10,
-       .vfp            = 2,
-       .vbp            = 2,
-#endif
-       .pixel_clock    = 6250,
-
-       .init           = apollon_panel_init,
-       .cleanup        = apollon_panel_cleanup,
-       .enable         = apollon_panel_enable,
-       .disable        = apollon_panel_disable,
-       .get_caps       = apollon_panel_get_caps,
-};
-
-static int apollon_panel_probe(struct platform_device *pdev)
-{
-       omapfb_register_panel(&apollon_panel);
-       return 0;
-}
-
-static int apollon_panel_remove(struct platform_device *pdev)
-{
-       return 0;
-}
-
-static int apollon_panel_suspend(struct platform_device *pdev,
-                                 pm_message_t mesg)
-{
-       return 0;
-}
-
-static int apollon_panel_resume(struct platform_device *pdev)
-{
-       return 0;
-}
-
-struct platform_driver apollon_panel_driver = {
-       .probe          = apollon_panel_probe,
-       .remove         = apollon_panel_remove,
-       .suspend        = apollon_panel_suspend,
-       .resume         = apollon_panel_resume,
-       .driver         = {
-               .name   = "apollon_lcd",
-               .owner  = THIS_MODULE,
-       },
-};
-
-static int __init apollon_panel_drv_init(void)
-{
-       return platform_driver_register(&apollon_panel_driver);
-}
-
-static void __exit apollon_panel_drv_exit(void)
-{
-       platform_driver_unregister(&apollon_panel_driver);
-}
-
-module_init(apollon_panel_drv_init);
-module_exit(apollon_panel_drv_exit);
index 31e4aebe6e4393f566dc3161f26ec7bda4866976..519c47d2057f8980f6370b9ef12deb0f7b6d2955 100644 (file)
@@ -275,6 +275,28 @@ static struct panel_config generic_dpi_panels[] = {
 
                .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 {