From 5f8ef853ec4fa7b7622f3f33a02861043ffa7eac Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Mon, 11 Mar 2013 13:57:38 +0200 Subject: [PATCH] --- yaml --- r: 371356 b: refs/heads/master c: f8ad984ce0372f43006f5c700310c2d6f301085d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dpi.c | 30 +++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index bc67db1b4a4d..e9ec97fa3517 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9f4e46714b11503f53619e9896db0506c35351c +refs/heads/master: f8ad984ce0372f43006f5c700310c2d6f301085d diff --git a/trunk/drivers/video/omap2/dss/dpi.c b/trunk/drivers/video/omap2/dss/dpi.c index ab6d8b0e94c7..c8c7776c8cfa 100644 --- a/trunk/drivers/video/omap2/dss/dpi.c +++ b/trunk/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 OMAP_DSS_CHANNEL_LCD: - return dsi_get_dsidev_from_id(0); - case OMAP_DSS_CHANNEL_LCD2: - return dsi_get_dsidev_from_id(1); + case OMAPDSS_VER_OMAP4430_ES1: + case OMAPDSS_VER_OMAP4430_ES2: + case OMAPDSS_VER_OMAP4: + switch (channel) { + 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; }