summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/dsi.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-03-01 16:58:39 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-05-11 14:54:38 +0300
commit9d8232a77fd55e00f0c519518c0ac5bbff1e477c (patch)
tree3d66ccadf59dd122577e2fb2f44f2b27a6c3bf89 /drivers/video/omap2/dss/dsi.c
parent35deca3de6190b6bc03e34ed45de079047f834ab (diff)
downloadlinux-stable-9d8232a77fd55e00f0c519518c0ac5bbff1e477c.tar.gz
linux-stable-9d8232a77fd55e00f0c519518c0ac5bbff1e477c.tar.bz2
linux-stable-9d8232a77fd55e00f0c519518c0ac5bbff1e477c.zip
OMAPDSS: init omap_dss_devices internally
Now that each output driver creates their own display devices, the output drivers can also initialize those devices. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dsi.c')
-rw-r--r--drivers/video/omap2/dss/dsi.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 78b962308a02..8cc0b2d53c6f 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -4454,7 +4454,7 @@ int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable)
}
EXPORT_SYMBOL(omapdss_dsi_enable_te);
-int dsi_init_display(struct omap_dss_device *dssdev)
+static int __init dsi_init_display(struct omap_dss_device *dssdev)
{
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -4710,6 +4710,12 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev)
if (dssdev->phy.dsi.module != dsi_module)
continue;
+ r = dsi_init_display(dssdev);
+ if (r) {
+ DSSERR("device %s init failed: %d\n", dssdev->name, r);
+ continue;
+ }
+
r = omap_dss_register_device(dssdev, &dsidev->dev, i);
if (r)
DSSERR("device %s register failed: %d\n",