summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen2012-11-16 13:59:56 +0100
committerTomi Valkeinen2013-06-17 13:00:26 +0200
commit0a20012605033c8acd8b2c209c422d78880e2896 (patch)
treea3c4e01855d74f0780cee4eaf1d7a923be0862f9 /drivers/video
parentLinux 3.10-rc5 (diff)
downloadkernel-qcow2-linux-0a20012605033c8acd8b2c209c422d78880e2896.tar.gz
kernel-qcow2-linux-0a20012605033c8acd8b2c209c422d78880e2896.tar.xz
kernel-qcow2-linux-0a20012605033c8acd8b2c209c422d78880e2896.zip
OMAPDSS: add pdata->default_display_name
We can currently set the default display (i.e. the initial display) in the omapdss platform data by using a pointer to the default omap_dss_device. Internally omapdss uses the device's name to resolve the default display. As it's difficult to get the omap_dss_device pointer in the future, after we've changed the omapdss device model, this patch adds a new way to define the default display, by using the name of the display. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index c9c2252e3719..710e9f9a4436 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -243,6 +243,8 @@ static int __init omap_dss_probe(struct platform_device *pdev)
if (def_disp_name)
core.default_display_name = def_disp_name;
+ else if (pdata->default_display_name)
+ core.default_display_name = pdata->default_display_name;
else if (pdata->default_device)
core.default_display_name = pdata->default_device->name;