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.

diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c
index 46f8a1e1dc1f20e99d580d20d2a04c8873c9019d..3561ba474d71c01d0ae3a84047714d361815679f 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 1a907d44e405a4a51898f9d3eab6da833101633b..1b65178e550dc10ff06279a09f6234ce1e91ffb2 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;