1 files changed, 22 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index ab6d8b0e94c7..c8c7776c8cfa 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -63,15 +63,29 @@ static struct platform_device *dpi_get_dsidev(enum omap_channel channel)
        case OMAPDSS_VER_OMAP3630:
        case OMAPDSS_VER_AM35xx:
                return NULL;
-        default:
-                break;
-        }
-        switch (channel) {
+        case OMAPDSS_VER_OMAP4430_ES1:
-        case OMAP_DSS_CHANNEL_LCD:
+        case OMAPDSS_VER_OMAP4430_ES2:
-                return dsi_get_dsidev_from_id(0);
+        case OMAPDSS_VER_OMAP4:
-        case OMAP_DSS_CHANNEL_LCD2:
+                switch (channel) {
-                return dsi_get_dsidev_from_id(1);
+                case OMAP_DSS_CHANNEL_LCD:
+                        return dsi_get_dsidev_from_id(0);
+                case OMAP_DSS_CHANNEL_LCD2:
+                        return dsi_get_dsidev_from_id(1);
+                default:
+                        return NULL;
+                }
+        case OMAPDSS_VER_OMAP5:
+                switch (channel) {
+                case OMAP_DSS_CHANNEL_LCD:
+                        return dsi_get_dsidev_from_id(0);
+                case OMAP_DSS_CHANNEL_LCD3:
+                        return dsi_get_dsidev_from_id(1);
+                default:
+                        return NULL;
+                }
        default:
                return NULL;
        }

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index ab6d8b0e94c7..c8c7776c8cfa 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c
@@ -63,15 +63,29 @@ static struct platform_device *dpi_get_dsidev(enum omap_channel channel)
63	case OMAPDSS_VER_OMAP3630:	63	case OMAPDSS_VER_OMAP3630:
64	case OMAPDSS_VER_AM35xx:	64	case OMAPDSS_VER_AM35xx:
65	return NULL;	65	return NULL;
66	default:
67	break;
68	}
69		66
70	switch (channel) {	67	case OMAPDSS_VER_OMAP4430_ES1:
71	case OMAP_DSS_CHANNEL_LCD:	68	case OMAPDSS_VER_OMAP4430_ES2:
72	return dsi_get_dsidev_from_id(0);	69	case OMAPDSS_VER_OMAP4:
73	case OMAP_DSS_CHANNEL_LCD2:	70	switch (channel) {
74	return dsi_get_dsidev_from_id(1);	71	case OMAP_DSS_CHANNEL_LCD:
		72	return dsi_get_dsidev_from_id(0);
		73	case OMAP_DSS_CHANNEL_LCD2:
		74	return dsi_get_dsidev_from_id(1);
		75	default:
		76	return NULL;
		77	}
		78
		79	case OMAPDSS_VER_OMAP5:
		80	switch (channel) {
		81	case OMAP_DSS_CHANNEL_LCD:
		82	return dsi_get_dsidev_from_id(0);
		83	case OMAP_DSS_CHANNEL_LCD3:
		84	return dsi_get_dsidev_from_id(1);
		85	default:
		86	return NULL;
		87	}
		88
75	default:	89	default:
76	return NULL;	90	return NULL;
77	}	91	}