summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2015-05-06 19:30:18 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2015-05-06 19:48:06 +0200
commit2013adf35e08980f123f1cf8edb95781abea20d4 (patch)
tree1f8ad348bd6689e96d40fa726a90c6f89a8243f2
parentcd5426fea754c4ce28efbf68acdbd1c2513bb80d (diff)
imx-common: 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.
-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 46f8a1e1dc..3561ba474d 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 1a907d44e4..1b65178e55 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;