summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen2013-02-13 11:17:43 +0100
committerTomi Valkeinen2013-04-03 14:19:01 +0200
commit002d368deeae2e8f2a081b21e4e3c1e2b4e69d9d (patch)
tree0770d5253d29343c16e08fd4fc469b18a63c4396 /drivers/video
parentOMAPDSS: add missing export for omap_dss_get_output() (diff)
downloadkernel-qcow2-linux-002d368deeae2e8f2a081b21e4e3c1e2b4e69d9d.tar.gz
kernel-qcow2-linux-002d368deeae2e8f2a081b21e4e3c1e2b4e69d9d.tar.xz
kernel-qcow2-linux-002d368deeae2e8f2a081b21e4e3c1e2b4e69d9d.zip
OMAPDSS: HDMI: init output earlier
Move hdmi driver's output initialization a bit earlier, so that it happens before hdmi panel init. In the future the hdmi panel will depend on the output being ready. 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/hdmi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index b53de043c03f..04edf325429b 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -1092,6 +1092,8 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
hdmi.ip_data.pll_offset = HDMI_PLLCTRL;
hdmi.ip_data.phy_offset = HDMI_PHY;
+ hdmi_init_output(pdev);
+
r = hdmi_panel_init();
if (r) {
DSSERR("can't init panel\n");
@@ -1100,8 +1102,6 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
dss_debugfs_create_file("hdmi", hdmi_dump_regs);
- hdmi_init_output(pdev);
-
hdmi_probe_pdata(pdev);
return 0;