summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2016-11-01 15:04:21 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2017-01-11 16:50:26 +0100
commit1b4fa4210e299c75b6347459c397361be70327ab (patch)
tree1458522670ea312932effa84538892b4efb3ab5a
parent79ab99cd78bb89076e6412462d86b40c7e20626d (diff)
imx: make ipu's di configurable
The ipu has two display interfaces. Make the used one a parameter in struct display_info_t instead of using unconditionally DI0. DI0 is the default setting. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Reviewed-by: Eric Nelson <eric@nelint.com> (cherry picked from commit 15fde0fc11f93f19f40c9cda36e7c8d4848d9c75)
-rw-r--r--arch/arm/imx-common/video.c2
-rw-r--r--arch/arm/include/asm/imx-common/video.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c
index fdc987f469..549bf9d957 100644
--- a/arch/arm/imx-common/video.c
+++ b/arch/arm/imx-common/video.c
@@ -34,7 +34,7 @@ int board_video_skip(void)
}
if (i < display_count) {
- ret = ipuv3_fb_init(&displays[i].mode, 0,
+ ret = ipuv3_fb_init(&displays[i].mode, displays[i].di ? 1 : 0,
displays[i].pixfmt);
if (!ret) {
if (displays[i].enable)
diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h
index cad5f861cb..941a031964 100644
--- a/arch/arm/include/asm/imx-common/video.h
+++ b/arch/arm/include/asm/imx-common/video.h
@@ -12,6 +12,7 @@ struct display_info_t {
int bus;
int addr;
int pixfmt;
+ int di;
int (*detect)(struct display_info_t const *dev);
void (*enable)(struct display_info_t const *dev);
struct fb_videomode mode;