From: Tomi Valkeinen Date: Wed, 4 Nov 2015 15:10:47 +0000 (+0200) Subject: OMAPDSS: handle WB channel in dispc_set/get_channel_out X-Git-Tag: v4.5-rc1~69^2~19 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c2665c4150ece59f13dcc78b9012d297acd96358;p=karo-tx-linux.git OMAPDSS: handle WB channel in dispc_set/get_channel_out Add handling of OMAP_DSS_CHANNEL_WB to dispc_ovl_set_channel_out() and dispc_ovl_get_channel_out(). Signed-off-by: Tomi Valkeinen --- diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c index 678a1928a9b5..4126d6225faf 100644 --- a/drivers/video/fbdev/omap2/dss/dispc.c +++ b/drivers/video/fbdev/omap2/dss/dispc.c @@ -974,6 +974,10 @@ void dispc_ovl_set_channel_out(enum omap_plane plane, enum omap_channel channel) return; } break; + case OMAP_DSS_CHANNEL_WB: + chan = 0; + chan2 = 3; + break; default: BUG(); return; @@ -1023,6 +1027,8 @@ static enum omap_channel dispc_ovl_get_channel_out(enum omap_plane plane) return OMAP_DSS_CHANNEL_LCD2; case 2: return OMAP_DSS_CHANNEL_LCD3; + case 3: + return OMAP_DSS_CHANNEL_WB; } }