diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-02-13 05:17:43 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-03 08:19:01 -0400 |
commit | 002d368deeae2e8f2a081b21e4e3c1e2b4e69d9d (patch) | |
tree | 0770d5253d29343c16e08fd4fc469b18a63c4396 | |
parent | 27831620a6d1b50d1a09f3a5bb3f1451b937b7ed (diff) |
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>
-rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 4 |
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) | |||
1092 | hdmi.ip_data.pll_offset = HDMI_PLLCTRL; | 1092 | hdmi.ip_data.pll_offset = HDMI_PLLCTRL; |
1093 | hdmi.ip_data.phy_offset = HDMI_PHY; | 1093 | hdmi.ip_data.phy_offset = HDMI_PHY; |
1094 | 1094 | ||
1095 | hdmi_init_output(pdev); | ||
1096 | |||
1095 | r = hdmi_panel_init(); | 1097 | r = hdmi_panel_init(); |
1096 | if (r) { | 1098 | if (r) { |
1097 | DSSERR("can't init panel\n"); | 1099 | DSSERR("can't init panel\n"); |
@@ -1100,8 +1102,6 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev) | |||
1100 | 1102 | ||
1101 | dss_debugfs_create_file("hdmi", hdmi_dump_regs); | 1103 | dss_debugfs_create_file("hdmi", hdmi_dump_regs); |
1102 | 1104 | ||
1103 | hdmi_init_output(pdev); | ||
1104 | |||
1105 | hdmi_probe_pdata(pdev); | 1105 | hdmi_probe_pdata(pdev); |
1106 | 1106 | ||
1107 | return 0; | 1107 | return 0; |