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>

diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c
index fdc987f469f9d64caf4d95f0f671cc1f18359e43..549bf9d957a0449559a8ff367bf337c9cd9178a7 100644 (file)
--- 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 cad5f861cb857ed91af00f5304c5ec7b9e73440b..941a031964c18d7bbd1614f613f1e70fccffbcdd 100644 (file)
--- 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;