From ef248b9f11ce869040fd32c1c7e094acfb4db212 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Mon, 18 Feb 2013 13:06:01 +0200
Subject: [PATCH] --- yaml --- r: 371351 b: refs/heads/master c:
 7286a08fb5607dbcf1a47639609d53d76b60e957 h: refs/heads/master i:   371349:
 da8092c30044d9e8fce9c2c692fbdf1aa257457d   371347:
 3d64f3d3eececa5c7b485234e87c3c77798ad6a1   371343:
 eea8dbeeda76e63c0d1f026e9ef4df21dd87497c v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/video/omap2/dss/dpi.c  | 1 +
 trunk/drivers/video/omap2/dss/dsi.c  | 1 +
 trunk/drivers/video/omap2/dss/hdmi.c | 1 +
 trunk/drivers/video/omap2/dss/rfbi.c | 1 +
 trunk/drivers/video/omap2/dss/sdi.c  | 1 +
 trunk/drivers/video/omap2/dss/venc.c | 1 +
 trunk/include/video/omapdss.h        | 2 ++
 8 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 137bddbd0954..a721e91e7605 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 002d368deeae2e8f2a081b21e4e3c1e2b4e69d9d
+refs/heads/master: 7286a08fb5607dbcf1a47639609d53d76b60e957
diff --git a/trunk/drivers/video/omap2/dss/dpi.c b/trunk/drivers/video/omap2/dss/dpi.c
index cb6b280124f1..e393b6ab60db 100644
--- a/trunk/drivers/video/omap2/dss/dpi.c
+++ b/trunk/drivers/video/omap2/dss/dpi.c
@@ -512,6 +512,7 @@ static void __init dpi_init_output(struct platform_device *pdev)
 	out->pdev = pdev;
 	out->id = OMAP_DSS_OUTPUT_DPI;
 	out->type = OMAP_DISPLAY_TYPE_DPI;
+	out->name = "dpi.0";
 
 	dss_register_output(out);
 }
diff --git a/trunk/drivers/video/omap2/dss/dsi.c b/trunk/drivers/video/omap2/dss/dsi.c
index 815c93047151..294c83299cea 100644
--- a/trunk/drivers/video/omap2/dss/dsi.c
+++ b/trunk/drivers/video/omap2/dss/dsi.c
@@ -5183,6 +5183,7 @@ static void __init dsi_init_output(struct platform_device *dsidev)
 			OMAP_DSS_OUTPUT_DSI1 : OMAP_DSS_OUTPUT_DSI2;
 
 	out->type = OMAP_DISPLAY_TYPE_DSI;
+	out->name = dsi->module_id == 0 ? "dsi.0" : "dsi.1";
 
 	dss_register_output(out);
 }
diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c
index 04edf325429b..9cbca03eff43 100644
--- a/trunk/drivers/video/omap2/dss/hdmi.c
+++ b/trunk/drivers/video/omap2/dss/hdmi.c
@@ -1046,6 +1046,7 @@ static void __init hdmi_init_output(struct platform_device *pdev)
 	out->pdev = pdev;
 	out->id = OMAP_DSS_OUTPUT_HDMI;
 	out->type = OMAP_DISPLAY_TYPE_HDMI;
+	out->name = "hdmi.0";
 
 	dss_register_output(out);
 }
diff --git a/trunk/drivers/video/omap2/dss/rfbi.c b/trunk/drivers/video/omap2/dss/rfbi.c
index e903dd3f54d9..d9d7f3511a7b 100644
--- a/trunk/drivers/video/omap2/dss/rfbi.c
+++ b/trunk/drivers/video/omap2/dss/rfbi.c
@@ -1025,6 +1025,7 @@ static void __init rfbi_init_output(struct platform_device *pdev)
 	out->pdev = pdev;
 	out->id = OMAP_DSS_OUTPUT_DBI;
 	out->type = OMAP_DISPLAY_TYPE_DBI;
+	out->name = "rfbi.0";
 
 	dss_register_output(out);
 }
diff --git a/trunk/drivers/video/omap2/dss/sdi.c b/trunk/drivers/video/omap2/dss/sdi.c
index 62b5374ce438..c27b58ad8e4d 100644
--- a/trunk/drivers/video/omap2/dss/sdi.c
+++ b/trunk/drivers/video/omap2/dss/sdi.c
@@ -278,6 +278,7 @@ static void __init sdi_init_output(struct platform_device *pdev)
 	out->pdev = pdev;
 	out->id = OMAP_DSS_OUTPUT_SDI;
 	out->type = OMAP_DISPLAY_TYPE_SDI;
+	out->name = "sdi.0";
 
 	dss_register_output(out);
 }
diff --git a/trunk/drivers/video/omap2/dss/venc.c b/trunk/drivers/video/omap2/dss/venc.c
index 006caf3cb509..4c07a25d3d9b 100644
--- a/trunk/drivers/video/omap2/dss/venc.c
+++ b/trunk/drivers/video/omap2/dss/venc.c
@@ -819,6 +819,7 @@ static void __init venc_init_output(struct platform_device *pdev)
 	out->pdev = pdev;
 	out->id = OMAP_DSS_OUTPUT_VENC;
 	out->type = OMAP_DISPLAY_TYPE_VENC;
+	out->name = "venc.0";
 
 	dss_register_output(out);
 }
diff --git a/trunk/include/video/omapdss.h b/trunk/include/video/omapdss.h
index 2cb2b0e812af..fa800b7ef832 100644
--- a/trunk/include/video/omapdss.h
+++ b/trunk/include/video/omapdss.h
@@ -541,6 +541,8 @@ struct omap_dss_writeback_info {
 struct omap_dss_output {
 	struct list_head list;
 
+	const char *name;
+
 	/* display type supported by the output */
 	enum omap_display_type type;