-
Olof Johansson authored
Merge tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup Clean up for omap DSS board init in preparation for adding DT support. By Tomi Valkeinen via Tomi Valkeinen (1) and Tony Lindgren (1) * tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: OMAPDSS: DSI: implement generic DSI pin config OMAPDSS: Taal: move reset gpio handling to taal driver OMAPDSS: TFP410: rename dvi files to tfp410 OMAPDSS: TFP410: rename dvi -> tfp410 OMAP: board-files: remove custom PD GPIO handling for DVI output OMAPDSS: panel-dvi: add PD gpio handling Resolved context conflicts in arch/arm/mach-omap2/board-omap4panda.c. Signed-off-by: Olof Johansson <olof@lixom.net>
d211093f