OMAPDSS: add output->name

Add name field to omapdss's outputs so that in the following patches
panels refer to the output by their name. The name also helps debugging.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index cb6b280124f15b44484aae4b1bbf2babb3ced1d2..e393b6ab60db9cfc0bf4c84d6b38e11d988a5f07 100644 (file)
--- a/drivers/video/omap2/dss/dpi.c
+++ b/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/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 815c93047151ec840c4e73bae23bbd68eee9063e..294c83299cea46fe9528e1fcbdf94c43764c8035 100644 (file)
--- a/drivers/video/omap2/dss/dsi.c
+++ b/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/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 04edf325429b47e0912c1e44ca52b6e6cb4f9515..9cbca03eff436535661cfb75afbe0ea0d34bd38b 100644 (file)
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/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/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index e903dd3f54d9466e802126e3801ac0c86dc10d4c..d9d7f3511a7ba1b424602b809ae13aaf1dba2af2 100644 (file)
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/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/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 62b5374ce438f3ff7e4db23d4ad5c6d5165456cd..c27b58ad8e4d547887ddec169ce5a064e07bc789 100644 (file)
--- a/drivers/video/omap2/dss/sdi.c
+++ b/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/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 006caf3cb509778d472d0a28d528cc3bde16748e..4c07a25d3d9b952285614f12d89dc82dee447294 100644 (file)
--- a/drivers/video/omap2/dss/venc.c
+++ b/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/include/video/omapdss.h b/include/video/omapdss.h
index 2cb2b0e812afc58a70c90fdd276ffcdead6d4273..fa800b7ef8328d607b12a91ced645ed6ba51de4a 100644 (file)
--- a/include/video/omapdss.h
+++ b/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;