diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-20 16:57:37 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-11 14:44:51 +0300 |
commit | a57dd4fe7bef557afaa1a6cdb77cd95b2cba094e (patch) | |
tree | 50cae3f775bc743299dc7285c758df599d2874cc /drivers/video/omap2/dss/dss.c | |
parent | 53f576a8dc5729e719c862aba2ed3430867bd5cb (diff) | |
download | op-kernel-dev-a57dd4fe7bef557afaa1a6cdb77cd95b2cba094e.zip op-kernel-dev-a57dd4fe7bef557afaa1a6cdb77cd95b2cba094e.tar.gz |
OMAPDSS: create DPI & SDI drivers
We currently have separate device/driver for each DSS HW module. The DPI
and SDI outputs are more or less parts of the DSS or DISPC hardware
modules, but in SW it makes sense to represent them as device/driver
pairs similarly to all the other outputs. This also makes sense for
device tree, as each node under dss will be a platform device, and
handling DPI & SDI somehow differently than the rest would just make the
code more complex.
This patch modifies the dpi.c and sdi.c to create drivers for the
platform devices.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dss.c')
-rw-r--r-- | drivers/video/omap2/dss/dss.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index c849d8b..7a7ddd8f 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c @@ -786,18 +786,6 @@ static int omap_dsshw_probe(struct platform_device *pdev) dss.lcd_clk_source[0] = OMAP_DSS_CLK_SRC_FCK; dss.lcd_clk_source[1] = OMAP_DSS_CLK_SRC_FCK; - r = dpi_init(); - if (r) { - DSSERR("Failed to initialize DPI\n"); - goto err_dpi; - } - - r = sdi_init(); - if (r) { - DSSERR("Failed to initialize SDI\n"); - goto err_sdi; - } - rev = dss_read_reg(DSS_REVISION); printk(KERN_INFO "OMAP DSS rev %d.%d\n", FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0)); @@ -805,10 +793,7 @@ static int omap_dsshw_probe(struct platform_device *pdev) dss_runtime_put(); return 0; -err_sdi: - dpi_exit(); -err_dpi: - dss_runtime_put(); + err_runtime_get: pm_runtime_disable(&pdev->dev); dss_put_clocks(); @@ -817,9 +802,6 @@ err_runtime_get: static int omap_dsshw_remove(struct platform_device *pdev) { - dpi_exit(); - sdi_exit(); - pm_runtime_disable(&pdev->dev); dss_put_clocks(); |