8 files changed, 91 insertions, 11 deletions

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index e393b6ab60db..ab6d8b0e94c7 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -396,6 +396,36 @@ static int __init dpi_verify_dsi_pll(struct platform_device *dsidev)
         return 0;
 }
 
+/*
+ * Return a hardcoded channel for the DPI output. This should work for
+ * current use cases, but this can be later expanded to either resolve
+ * the channel in some more dynamic manner, or get the channel as a user
+ * parameter.
+ */
+static enum omap_channel dpi_get_channel(void)
+{
+        switch (omapdss_get_version()) {
+        case OMAPDSS_VER_OMAP24xx:
+        case OMAPDSS_VER_OMAP34xx_ES1:
+        case OMAPDSS_VER_OMAP34xx_ES3:
+        case OMAPDSS_VER_OMAP3630:
+        case OMAPDSS_VER_AM35xx:
+                return OMAP_DSS_CHANNEL_LCD;
+
+        case OMAPDSS_VER_OMAP4430_ES1:
+        case OMAPDSS_VER_OMAP4430_ES2:
+        case OMAPDSS_VER_OMAP4:
+                return OMAP_DSS_CHANNEL_LCD2;
+
+        case OMAPDSS_VER_OMAP5:
+                return OMAP_DSS_CHANNEL_LCD3;
+
+        default:
+                DSSWARN("unsupported DSS version\n");
+                return OMAP_DSS_CHANNEL_LCD;
+        }
+}
+
 static int __init dpi_init_display(struct omap_dss_device *dssdev)
 {
         struct platform_device *dsidev;
@@ -416,12 +446,7 @@ static int __init dpi_init_display(struct omap_dss_device *dssdev)
                 dpi.vdds_dsi_reg = vdds_dsi;
         }
 
-        /*
-         * XXX We shouldn't need dssdev->channel for this. The dsi pll clock
-         * source for DPI is SoC integration detail, not something that should
-         * be configured in the dssdev
-         */
-        dsidev = dpi_get_dsidev(dssdev->channel);
+        dsidev = dpi_get_dsidev(dpi.output.dispc_channel);
 
         if (dsidev && dpi_verify_dsi_pll(dsidev)) {
                 dsidev = NULL;
@@ -513,6 +538,7 @@ static void __init dpi_init_output(struct platform_device *pdev)
         out->id = OMAP_DSS_OUTPUT_DPI;
         out->type = OMAP_DISPLAY_TYPE_DPI;
         out->name = "dpi.0";
+        out->dispc_channel = dpi_get_channel();
 
         dss_register_output(out);
 }
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 294c83299cea..d13e77c01d7e 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -4946,6 +4946,55 @@ void omapdss_dsi_set_videomode_timings(struct omap_dss_device *dssdev,
 }
 EXPORT_SYMBOL(omapdss_dsi_set_videomode_timings);
 
+/*
+ * Return a hardcoded channel for the DSI output. This should work for
+ * current use cases, but this can be later expanded to either resolve
+ * the channel in some more dynamic manner, or get the channel as a user
+ * parameter.
+ */
+static enum omap_channel dsi_get_channel(int module_id)
+{
+        switch (omapdss_get_version()) {
+        case OMAPDSS_VER_OMAP24xx:
+                DSSWARN("DSI not supported\n");
+                return OMAP_DSS_CHANNEL_LCD;
+
+        case OMAPDSS_VER_OMAP34xx_ES1:
+        case OMAPDSS_VER_OMAP34xx_ES3:
+        case OMAPDSS_VER_OMAP3630:
+        case OMAPDSS_VER_AM35xx:
+                return OMAP_DSS_CHANNEL_LCD;
+
+        case OMAPDSS_VER_OMAP4430_ES1:
+        case OMAPDSS_VER_OMAP4430_ES2:
+        case OMAPDSS_VER_OMAP4:
+                switch (module_id) {
+                case 0:
+                        return OMAP_DSS_CHANNEL_LCD;
+                case 1:
+                        return OMAP_DSS_CHANNEL_LCD2;
+                default:
+                        DSSWARN("unsupported module id\n");
+                        return OMAP_DSS_CHANNEL_LCD;
+                }
+
+        case OMAPDSS_VER_OMAP5:
+                switch (module_id) {
+                case 0:
+                        return OMAP_DSS_CHANNEL_LCD;
+                case 1:
+                        return OMAP_DSS_CHANNEL_LCD3;
+                default:
+                        DSSWARN("unsupported module id\n");
+                        return OMAP_DSS_CHANNEL_LCD;
+                }
+
+        default:
+                DSSWARN("unsupported DSS version\n");
+                return OMAP_DSS_CHANNEL_LCD;
+        }
+}
+
 static int __init dsi_init_display(struct omap_dss_device *dssdev)
 {
         struct platform_device *dsidev =
@@ -5184,6 +5233,7 @@ static void __init dsi_init_output(struct platform_device *dsidev)
 
         out->type = OMAP_DISPLAY_TYPE_DSI;
         out->name = dsi->module_id == 0 ? "dsi.0" : "dsi.1";
+        out->dispc_channel = dsi_get_channel(dsi->module_id);
 
         dss_register_output(out);
 }
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 9cbca03eff43..a6f953898d94 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -1012,8 +1012,6 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev)
         hdmi.ls_oe_gpio = priv->ls_oe_gpio;
         hdmi.hpd_gpio = priv->hpd_gpio;
 
-        dssdev->channel = OMAP_DSS_CHANNEL_DIGIT;
-
         r = hdmi_init_display(dssdev);
         if (r) {
                 DSSERR("device %s init failed: %d\n", dssdev->name, r);
@@ -1047,6 +1045,7 @@ static void __init hdmi_init_output(struct platform_device *pdev)
         out->id = OMAP_DSS_OUTPUT_HDMI;
         out->type = OMAP_DISPLAY_TYPE_HDMI;
         out->name = "hdmi.0";
+        out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
 
         dss_register_output(out);
 }
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index d9d7f3511a7b..1a691bb27547 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -1026,6 +1026,7 @@ static void __init rfbi_init_output(struct platform_device *pdev)
         out->id = OMAP_DSS_OUTPUT_DBI;
         out->type = OMAP_DISPLAY_TYPE_DBI;
         out->name = "rfbi.0";
+        out->dispc_channel = OMAP_DSS_CHANNEL_LCD;
 
         dss_register_output(out);
 }
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index c27b58ad8e4d..3888cfa0881c 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -279,6 +279,7 @@ static void __init sdi_init_output(struct platform_device *pdev)
         out->id = OMAP_DSS_OUTPUT_SDI;
         out->type = OMAP_DISPLAY_TYPE_SDI;
         out->name = "sdi.0";
+        out->dispc_channel = OMAP_DSS_CHANNEL_LCD;
 
         dss_register_output(out);
 }
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 4c07a25d3d9b..5cb983e2f170 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -786,8 +786,6 @@ static void __init venc_probe_pdata(struct platform_device *vencdev)
 
         dss_copy_device_pdata(dssdev, plat_dssdev);
 
-        dssdev->channel = OMAP_DSS_CHANNEL_DIGIT;
-
         r = venc_init_display(dssdev);
         if (r) {
                 DSSERR("device %s init failed: %d\n", dssdev->name, r);
@@ -820,6 +818,7 @@ static void __init venc_init_output(struct platform_device *pdev)
         out->id = OMAP_DSS_OUTPUT_VENC;
         out->type = OMAP_DISPLAY_TYPE_VENC;
         out->name = "venc.0";
+        out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
 
         dss_register_output(out);
 }
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index ca585ef37f25..f38348ea3375 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2388,7 +2388,7 @@ static int omapfb_init_connections(struct omapfb2_device *fbdev,
                 struct omap_dss_device *dssdev = fbdev->displays[i].dssdev;
                 struct omap_dss_output *out = dssdev->output;
 
-                mgr = omap_dss_get_overlay_manager(dssdev->channel);
+                mgr = omap_dss_get_overlay_manager(out->dispc_channel);
 
                 if (!mgr || !out)
                         continue;
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index fa800b7ef832..41fb434093e9 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -546,6 +546,9 @@ struct omap_dss_output {
         /* display type supported by the output */
         enum omap_display_type type;
 
+        /* DISPC channel for this output */
+        enum omap_channel dispc_channel;
+
         /* output instance */
         enum omap_dss_output_id id;
 
@@ -563,6 +566,7 @@ struct omap_dss_device {
 
         enum omap_display_type type;
 
+        /* obsolete, to be removed */
         enum omap_channel channel;
 
         union {