]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
OMAP: DSS2: Add generic DPI panel display driver
authorBryan Wu <bryan.wu@canonical.com>
Wed, 17 Nov 2010 13:34:33 +0000 (13:34 +0000)
committerTomi Valkeinen <tomi.valkeinen@nokia.com>
Mon, 10 Jan 2011 09:09:53 +0000 (11:09 +0200)
Generic DPI panel driver includes the driver and 4 similar panel configurations. It
will match the panel name which is passed from platform data and setup the
right configurations.

With generic DPI panel driver, we can remove those 4 duplicated panel display
drivers. In the future, it is simple for us just add new panel configuration
date in panel-generic-dpi.c to support new display panel.

Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
arch/arm/plat-omap/include/plat/panel-generic-dpi.h [new file with mode: 0644]
drivers/video/omap2/displays/Kconfig
drivers/video/omap2/displays/Makefile
drivers/video/omap2/displays/panel-generic-dpi.c [new file with mode: 0644]

diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
new file mode 100644 (file)
index 0000000..7906197
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ * Header for generic DPI panel driver
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
+#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
+
+#include "display.h"
+
+/**
+ * struct panel_generic_dpi_data - panel driver configuration data
+ * @name: panel name
+ * @platform_enable: platform specific panel enable function
+ * @platform_disable: platform specific panel disable function
+ */
+struct panel_generic_dpi_data {
+       const char *name;
+       int (*platform_enable)(struct omap_dss_device *dssdev);
+       void (*platform_disable)(struct omap_dss_device *dssdev);
+};
+
+#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
index f8152cfedb5fa9847fa930607cfb6ab7c23fa66d..6d921969e731340975b62b357e50706e84f2db49 100644 (file)
@@ -1,6 +1,14 @@
 menu "OMAP2/3 Display Device Drivers"
         depends on OMAP2_DSS
 
+config PANEL_GENERIC_DPI
+        tristate "Generic DPI Panel"
+        help
+         Generic DPI panel driver.
+         Supports DVI output for Beagle and OMAP3 SDP.
+         Supports LCD Panel used in TI SDP3430 and EVM boards,
+         OMAP3517 EVM boards and CM-T35.
+
 config PANEL_GENERIC
         tristate "Generic Panel"
         help
index 8ece91cfe17749c909b0f2d444b9fcac778aa07e..48f9c88af0c7154829dde518f72ef412397dbb7e 100644 (file)
@@ -1,3 +1,4 @@
+obj-$(CONFIG_PANEL_GENERIC_DPI) += panel-generic-dpi.o
 obj-$(CONFIG_PANEL_GENERIC) += panel-generic.o
 obj-$(CONFIG_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
 obj-$(CONFIG_PANEL_SHARP_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
new file mode 100644 (file)
index 0000000..6702cf6
--- /dev/null
@@ -0,0 +1,355 @@
+/*
+ * Generic DPI Panels support
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.com>
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+
+#include <plat/panel-generic-dpi.h>
+
+struct panel_config {
+       struct omap_video_timings timings;
+
+       int acbi;       /* ac-bias pin transitions per interrupt */
+       /* Unit: line clocks */
+       int acb;        /* ac-bias pin frequency */
+
+       enum omap_panel_config config;
+
+       int power_on_delay;
+       int power_off_delay;
+
+       /*
+        * Used to match device to panel configuration
+        * when use generic panel driver
+        */
+       const char *name;
+};
+
+/* 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 */
+       {
+               {
+                       .x_res          = 480,
+                       .y_res          = 272,
+
+                       .pixel_clock    = 9000,
+
+                       .hsw            = 42,
+                       .hfp            = 3,
+                       .hbp            = 2,
+
+                       .vsw            = 11,
+                       .vfp            = 3,
+                       .vbp            = 2,
+               },
+               .acbi                   = 0x0,
+               .acb                    = 0x0,
+               .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                       OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO,
+               .power_on_delay         = 50,
+               .power_off_delay        = 100,
+               .name                   = "sharp_lq",
+       },
+
+       /* Sharp LS037V7DW01 */
+       {
+               {
+                       .x_res          = 480,
+                       .y_res          = 640,
+
+                       .pixel_clock    = 19200,
+
+                       .hsw            = 2,
+                       .hfp            = 1,
+                       .hbp            = 28,
+
+                       .vsw            = 1,
+                       .vfp            = 1,
+                       .vbp            = 1,
+               },
+               .acbi                   = 0x0,
+               .acb                    = 0x28,
+               .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                               OMAP_DSS_LCD_IHS,
+               .power_on_delay         = 50,
+               .power_off_delay        = 100,
+               .name                   = "sharp_ls",
+       },
+
+       /* Toppoly TDO35S */
+       {
+               {
+                       .x_res          = 480,
+                       .y_res          = 640,
+
+                       .pixel_clock    = 26000,
+
+                       .hfp            = 104,
+                       .hsw            = 8,
+                       .hbp            = 8,
+
+                       .vfp            = 4,
+                       .vsw            = 2,
+                       .vbp            = 2,
+               },
+               .acbi                   = 0x0,
+               .acb                    = 0x0,
+               .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                       OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC |
+                                       OMAP_DSS_LCD_ONOFF,
+               .power_on_delay         = 0,
+               .power_off_delay        = 0,
+               .name                   = "toppoly_tdo35s",
+       },
+};
+
+struct panel_drv_data {
+
+       struct omap_dss_device *dssdev;
+
+       struct panel_config *panel_config;
+};
+
+static inline struct panel_generic_dpi_data
+*get_panel_data(const struct omap_dss_device *dssdev)
+{
+       return (struct panel_generic_dpi_data *) dssdev->data;
+}
+
+static int generic_dpi_panel_power_on(struct omap_dss_device *dssdev)
+{
+       int r;
+       struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+       struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);
+       struct panel_config *panel_config = drv_data->panel_config;
+
+       if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
+               return 0;
+
+       r = omapdss_dpi_display_enable(dssdev);
+       if (r)
+               goto err0;
+
+       /* wait couple of vsyncs until enabling the LCD */
+       if (panel_config->power_on_delay)
+               msleep(panel_config->power_on_delay);
+
+       if (panel_data->platform_enable) {
+               r = panel_data->platform_enable(dssdev);
+               if (r)
+                       goto err1;
+       }
+
+       return 0;
+err1:
+       omapdss_dpi_display_disable(dssdev);
+err0:
+       return r;
+}
+
+static void generic_dpi_panel_power_off(struct omap_dss_device *dssdev)
+{
+       struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+       struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);
+       struct panel_config *panel_config = drv_data->panel_config;
+
+       if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+               return;
+
+       if (panel_data->platform_disable)
+               panel_data->platform_disable(dssdev);
+
+       /* wait couple of vsyncs after disabling the LCD */
+       if (panel_config->power_off_delay)
+               msleep(panel_config->power_off_delay);
+
+       omapdss_dpi_display_disable(dssdev);
+}
+
+static int generic_dpi_panel_probe(struct omap_dss_device *dssdev)
+{
+       struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+       struct panel_config *panel_config = NULL;
+       struct panel_drv_data *drv_data = NULL;
+       int i;
+
+       dev_dbg(&dssdev->dev, "probe\n");
+
+       if (!panel_data || !panel_data->name)
+               return -EINVAL;
+
+       for (i = 0; i < ARRAY_SIZE(generic_dpi_panels); i++) {
+               if (strcmp(panel_data->name, generic_dpi_panels[i].name) == 0) {
+                       panel_config = &generic_dpi_panels[i];
+                       break;
+               }
+       }
+
+       if (!panel_config)
+               return -EINVAL;
+
+       dssdev->panel.config = panel_config->config;
+       dssdev->panel.timings = panel_config->timings;
+       dssdev->panel.acb = panel_config->acb;
+       dssdev->panel.acbi = panel_config->acbi;
+
+       drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL);
+       if (!drv_data)
+               return -ENOMEM;
+
+       drv_data->dssdev = dssdev;
+       drv_data->panel_config = panel_config;
+
+       dev_set_drvdata(&dssdev->dev, drv_data);
+
+       return 0;
+}
+
+static void generic_dpi_panel_remove(struct omap_dss_device *dssdev)
+{
+       struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);
+
+       dev_dbg(&dssdev->dev, "remove\n");
+
+       kfree(drv_data);
+
+       dev_set_drvdata(&dssdev->dev, NULL);
+}
+
+static int generic_dpi_panel_enable(struct omap_dss_device *dssdev)
+{
+       int r = 0;
+
+       r = generic_dpi_panel_power_on(dssdev);
+       if (r)
+               return r;
+
+       dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+       return 0;
+}
+
+static void generic_dpi_panel_disable(struct omap_dss_device *dssdev)
+{
+       generic_dpi_panel_power_off(dssdev);
+
+       dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int generic_dpi_panel_suspend(struct omap_dss_device *dssdev)
+{
+       generic_dpi_panel_power_off(dssdev);
+
+       dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
+       return 0;
+}
+
+static int generic_dpi_panel_resume(struct omap_dss_device *dssdev)
+{
+       int r = 0;
+
+       r = generic_dpi_panel_power_on(dssdev);
+       if (r)
+               return r;
+
+       dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+       return 0;
+}
+
+static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,
+               struct omap_video_timings *timings)
+{
+       dpi_set_timings(dssdev, timings);
+}
+
+static void generic_dpi_panel_get_timings(struct omap_dss_device *dssdev,
+               struct omap_video_timings *timings)
+{
+       *timings = dssdev->panel.timings;
+}
+
+static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev,
+               struct omap_video_timings *timings)
+{
+       return dpi_check_timings(dssdev, timings);
+}
+
+static struct omap_dss_driver dpi_driver = {
+       .probe          = generic_dpi_panel_probe,
+       .remove         = generic_dpi_panel_remove,
+
+       .enable         = generic_dpi_panel_enable,
+       .disable        = generic_dpi_panel_disable,
+       .suspend        = generic_dpi_panel_suspend,
+       .resume         = generic_dpi_panel_resume,
+
+       .set_timings    = generic_dpi_panel_set_timings,
+       .get_timings    = generic_dpi_panel_get_timings,
+       .check_timings  = generic_dpi_panel_check_timings,
+
+       .driver         = {
+               .name   = "generic_dpi_panel",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init generic_dpi_panel_drv_init(void)
+{
+       return omap_dss_register_driver(&dpi_driver);
+}
+
+static void __exit generic_dpi_panel_drv_exit(void)
+{
+       omap_dss_unregister_driver(&dpi_driver);
+}
+
+module_init(generic_dpi_panel_drv_init);
+module_exit(generic_dpi_panel_drv_exit);
+MODULE_LICENSE("GPL");