]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
OMAPDSS: Add new DVI Connector driver
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 24 May 2013 11:20:45 +0000 (14:20 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 17 Jun 2013 11:30:03 +0000 (14:30 +0300)
Add DVI Connector driver which uses the new DSS device model and DSS
ops.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/omap2/displays-new/Kconfig
drivers/video/omap2/displays-new/Makefile
drivers/video/omap2/displays-new/connector-dvi.c [new file with mode: 0644]
include/video/omap-panel-data.h

index 6e4af85cf182cab5f4514019f3690d1548ed5d6a..76570fc94c517b6a8610fb80d9a7296391ca8635 100644 (file)
@@ -12,4 +12,10 @@ config DISPLAY_ENCODER_TPD12S015
          Driver for TPD12S015, which offers HDMI ESD protection and level
          shifting.
 
+config DISPLAY_CONNECTOR_DVI
+        tristate "DVI Connector"
+       depends on I2C
+       help
+         Driver for a generic DVI connector.
+
 endmenu
index c2ee45e2e2c3bb3aaaa88e05df4c0bfde7451480..ed7dd062dc922b15b8a4dc01c3bbc096f7e505e1 100644 (file)
@@ -1,2 +1,3 @@
 obj-$(CONFIG_DISPLAY_ENCODER_TFP410) += encoder-tfp410.o
 obj-$(CONFIG_DISPLAY_ENCODER_TPD12S015) += encoder-tpd12s015.o
+obj-$(CONFIG_DISPLAY_CONNECTOR_DVI) += connector-dvi.o
diff --git a/drivers/video/omap2/displays-new/connector-dvi.c b/drivers/video/omap2/displays-new/connector-dvi.c
new file mode 100644 (file)
index 0000000..bc5f8ce
--- /dev/null
@@ -0,0 +1,351 @@
+/*
+ * Generic DVI Connector driver
+ *
+ * Copyright (C) 2013 Texas Instruments
+ * Author: Tomi Valkeinen <tomi.valkeinen@ti.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.
+ */
+
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include <drm/drm_edid.h>
+
+#include <video/omapdss.h>
+#include <video/omap-panel-data.h>
+
+static const struct omap_video_timings dvic_default_timings = {
+       .x_res          = 640,
+       .y_res          = 480,
+
+       .pixel_clock    = 23500,
+
+       .hfp            = 48,
+       .hsw            = 32,
+       .hbp            = 80,
+
+       .vfp            = 3,
+       .vsw            = 4,
+       .vbp            = 7,
+
+       .vsync_level    = OMAPDSS_SIG_ACTIVE_HIGH,
+       .hsync_level    = OMAPDSS_SIG_ACTIVE_HIGH,
+       .data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE,
+       .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
+       .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
+};
+
+struct panel_drv_data {
+       struct omap_dss_device dssdev;
+       struct omap_dss_device *in;
+
+       struct omap_video_timings timings;
+
+       struct i2c_adapter *i2c_adapter;
+};
+
+#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
+
+static int dvic_connect(struct omap_dss_device *dssdev)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+       struct omap_dss_device *in = ddata->in;
+       int r;
+
+       if (omapdss_device_is_connected(dssdev))
+               return 0;
+
+       r = in->ops.dvi->connect(in, dssdev);
+       if (r)
+               return r;
+
+       return 0;
+}
+
+static void dvic_disconnect(struct omap_dss_device *dssdev)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+       struct omap_dss_device *in = ddata->in;
+
+       if (!omapdss_device_is_connected(dssdev))
+               return;
+
+       in->ops.dvi->disconnect(in, dssdev);
+}
+
+static int dvic_enable(struct omap_dss_device *dssdev)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+       struct omap_dss_device *in = ddata->in;
+       int r;
+
+       if (!omapdss_device_is_connected(dssdev))
+               return -ENODEV;
+
+       if (omapdss_device_is_enabled(dssdev))
+               return 0;
+
+       in->ops.dvi->set_timings(in, &ddata->timings);
+
+       r = in->ops.dvi->enable(in);
+       if (r)
+               return r;
+
+       dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+       return 0;
+}
+
+static void dvic_disable(struct omap_dss_device *dssdev)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+       struct omap_dss_device *in = ddata->in;
+
+       if (!omapdss_device_is_enabled(dssdev))
+               return;
+
+       in->ops.dvi->disable(in);
+
+       dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static void dvic_set_timings(struct omap_dss_device *dssdev,
+               struct omap_video_timings *timings)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+       struct omap_dss_device *in = ddata->in;
+
+       ddata->timings = *timings;
+       dssdev->panel.timings = *timings;
+
+       in->ops.dvi->set_timings(in, timings);
+}
+
+static void dvic_get_timings(struct omap_dss_device *dssdev,
+               struct omap_video_timings *timings)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+
+       *timings = ddata->timings;
+}
+
+static int dvic_check_timings(struct omap_dss_device *dssdev,
+               struct omap_video_timings *timings)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+       struct omap_dss_device *in = ddata->in;
+
+       return in->ops.dvi->check_timings(in, timings);
+}
+
+static int dvic_ddc_read(struct i2c_adapter *adapter,
+               unsigned char *buf, u16 count, u8 offset)
+{
+       int r, retries;
+
+       for (retries = 3; retries > 0; retries--) {
+               struct i2c_msg msgs[] = {
+                       {
+                               .addr   = DDC_ADDR,
+                               .flags  = 0,
+                               .len    = 1,
+                               .buf    = &offset,
+                       }, {
+                               .addr   = DDC_ADDR,
+                               .flags  = I2C_M_RD,
+                               .len    = count,
+                               .buf    = buf,
+                       }
+               };
+
+               r = i2c_transfer(adapter, msgs, 2);
+               if (r == 2)
+                       return 0;
+
+               if (r != -EAGAIN)
+                       break;
+       }
+
+       return r < 0 ? r : -EIO;
+}
+
+static int dvic_read_edid(struct omap_dss_device *dssdev,
+               u8 *edid, int len)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+       int r, l, bytes_read;
+
+       if (!ddata->i2c_adapter)
+               return -ENODEV;
+
+       l = min(EDID_LENGTH, len);
+       r = dvic_ddc_read(ddata->i2c_adapter, edid, l, 0);
+       if (r)
+               return r;
+
+       bytes_read = l;
+
+       /* if there are extensions, read second block */
+       if (len > EDID_LENGTH && edid[0x7e] > 0) {
+               l = min(EDID_LENGTH, len - EDID_LENGTH);
+
+               r = dvic_ddc_read(ddata->i2c_adapter, edid + EDID_LENGTH,
+                               l, EDID_LENGTH);
+               if (r)
+                       return r;
+
+               bytes_read += l;
+       }
+
+       return bytes_read;
+}
+
+static bool dvic_detect(struct omap_dss_device *dssdev)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+       unsigned char out;
+       int r;
+
+       if (!ddata->i2c_adapter)
+               return true;
+
+       r = dvic_ddc_read(ddata->i2c_adapter, &out, 1, 0);
+
+       return r == 0;
+}
+
+static struct omap_dss_driver dvic_driver = {
+       .connect        = dvic_connect,
+       .disconnect     = dvic_disconnect,
+
+       .enable         = dvic_enable,
+       .disable        = dvic_disable,
+
+       .set_timings    = dvic_set_timings,
+       .get_timings    = dvic_get_timings,
+       .check_timings  = dvic_check_timings,
+
+       .get_resolution = omapdss_default_get_resolution,
+
+       .read_edid      = dvic_read_edid,
+       .detect         = dvic_detect,
+};
+
+static int dvic_probe_pdata(struct platform_device *pdev)
+{
+       struct panel_drv_data *ddata = platform_get_drvdata(pdev);
+       struct connector_dvi_platform_data *pdata;
+       struct omap_dss_device *in, *dssdev;
+       int i2c_bus_num;
+
+       pdata = dev_get_platdata(&pdev->dev);
+       i2c_bus_num = pdata->i2c_bus_num;
+
+       if (i2c_bus_num != -1) {
+               struct i2c_adapter *adapter;
+
+               adapter = i2c_get_adapter(i2c_bus_num);
+               if (!adapter) {
+                       dev_err(&pdev->dev,
+                                       "Failed to get I2C adapter, bus %d\n",
+                                       i2c_bus_num);
+                       return -EPROBE_DEFER;
+               }
+
+               ddata->i2c_adapter = adapter;
+       }
+
+       in = omap_dss_find_output(pdata->source);
+       if (in == NULL) {
+               dev_err(&pdev->dev, "Failed to find video source\n");
+               return -ENODEV;
+       }
+
+       ddata->in = in;
+
+       dssdev = &ddata->dssdev;
+       dssdev->name = pdata->name;
+
+       return 0;
+}
+
+static int dvic_probe(struct platform_device *pdev)
+{
+       struct panel_drv_data *ddata;
+       struct omap_dss_device *dssdev;
+       int r;
+
+       ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
+       if (!ddata)
+               return -ENOMEM;
+
+       platform_set_drvdata(pdev, ddata);
+
+       if (dev_get_platdata(&pdev->dev)) {
+               r = dvic_probe_pdata(pdev);
+               if (r)
+                       return r;
+       } else {
+               return -ENODEV;
+       }
+
+       ddata->timings = dvic_default_timings;
+
+       dssdev = &ddata->dssdev;
+       dssdev->driver = &dvic_driver;
+       dssdev->dev = &pdev->dev;
+       dssdev->type = OMAP_DISPLAY_TYPE_DVI;
+       dssdev->owner = THIS_MODULE;
+       dssdev->panel.timings = dvic_default_timings;
+
+       r = omapdss_register_display(dssdev);
+       if (r) {
+               dev_err(&pdev->dev, "Failed to register panel\n");
+               goto err_reg;
+       }
+
+       return 0;
+
+err_reg:
+       omap_dss_put_device(ddata->in);
+       return r;
+}
+
+static int __exit dvic_remove(struct platform_device *pdev)
+{
+       struct panel_drv_data *ddata = platform_get_drvdata(pdev);
+       struct omap_dss_device *dssdev = &ddata->dssdev;
+       struct omap_dss_device *in = ddata->in;
+
+       omapdss_unregister_display(&ddata->dssdev);
+
+       dvic_disable(dssdev);
+       dvic_disconnect(dssdev);
+
+       omap_dss_put_device(in);
+
+       if (ddata->i2c_adapter)
+               i2c_put_adapter(ddata->i2c_adapter);
+
+       return 0;
+}
+
+static struct platform_driver dvi_connector_driver = {
+       .probe  = dvic_probe,
+       .remove = __exit_p(dvic_remove),
+       .driver = {
+               .name   = "connector-dvi",
+               .owner  = THIS_MODULE,
+       },
+};
+
+module_platform_driver(dvi_connector_driver);
+
+MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
+MODULE_DESCRIPTION("Generic DVI Connector driver");
+MODULE_LICENSE("GPL");
index aa58612ec8ab3309018c2c87a8ac4df266c86bbb..3eaaaf638a84b1613bffc05ab43615cd1bb461a4 100644 (file)
@@ -176,4 +176,16 @@ struct encoder_tpd12s015_platform_data {
        int hpd_gpio;
 };
 
+/**
+ * connector_dvi platform data
+ * @name: name for this display entity
+ * @source: name of the display entity used as a video source
+ * @i2c_bus_num: i2c bus number to be used for reading EDID
+ */
+struct connector_dvi_platform_data {
+       const char *name;
+       const char *source;
+       int i2c_bus_num;
+};
+
 #endif /* __OMAP_PANEL_DATA_H */