Merge tag 'imx-drm-next-2015-03-31' of git://git.pengutronix.de/git/pza/linux into drm-next

imx-drm changes to use media bus formats and LDB drm_panel support

- Add media bus formats needed by imx-drm
- Switch to use media bus formats to describe the pixel format
  on the internal parallel bus between display interface and
  encoders
- Some preparations for TV Output via TVEv2 on i.MX5
- Add drm_panel support to the i.MX LVDS driver, allow to
  determine the bus pixel format from the panel descriptor.

* tag 'imx-drm-next-2015-03-31' of git://git.pengutronix.de/git/pza/linux:
  drm/imx: imx-ldb: allow to determine bus format from the connected panel
  drm/imx: imx-ldb: reset display clock input when disabling LVDS
  drm/imx: imx-ldb: add drm_panel support
  drm/imx: consolidate bus format variable names
  drm/imx: switch to use media bus formats
  Add RGB666_1X24_CPADHI media bus format
  Add YUV8_1X24 media bus format
  Add BGR888_1X24 and GBR888_1X24 media bus formats
  Add LVDS RGB media bus formats
  Add RGB444_1X12 and RGB565_1X16 media bus formats
  drm/imx: ipuv3-crtc: Allow to divide DI clock from TVEv2
  drm/imx: Add support for interlaced scanout

1 files changed, 11 insertions, 2 deletions

diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 23b40908be30..83ea46f4be51 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -33,22 +33,30 @@
 
 #define MEDIA_BUS_FMT_FIXED                     0x0001
 
-/* RGB - next is        0x100e */
+/* RGB - next is        0x1016 */
+#define MEDIA_BUS_FMT_RGB444_1X12               0x100e
 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE       0x1001
 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE       0x1002
 #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE       0x1003
 #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE       0x1004
+#define MEDIA_BUS_FMT_RGB565_1X16               0x100f
 #define MEDIA_BUS_FMT_BGR565_2X8_BE             0x1005
 #define MEDIA_BUS_FMT_BGR565_2X8_LE             0x1006
 #define MEDIA_BUS_FMT_RGB565_2X8_BE             0x1007
 #define MEDIA_BUS_FMT_RGB565_2X8_LE             0x1008
 #define MEDIA_BUS_FMT_RGB666_1X18               0x1009
+#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI        0x1015
+#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG         0x1010
+#define MEDIA_BUS_FMT_BGR888_1X24               0x1013
+#define MEDIA_BUS_FMT_GBR888_1X24               0x1014
 #define MEDIA_BUS_FMT_RGB888_1X24               0x100a
 #define MEDIA_BUS_FMT_RGB888_2X12_BE            0x100b
 #define MEDIA_BUS_FMT_RGB888_2X12_LE            0x100c
+#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG         0x1011
+#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA        0x1012
 #define MEDIA_BUS_FMT_ARGB8888_1X32             0x100d
 
-/* YUV (including grey) - next is       0x2024 */
+/* YUV (including grey) - next is       0x2025 */
 #define MEDIA_BUS_FMT_Y8_1X8                    0x2001
 #define MEDIA_BUS_FMT_UV8_1X8                   0x2015
 #define MEDIA_BUS_FMT_UYVY8_1_5X8               0x2002
@@ -74,6 +82,7 @@
 #define MEDIA_BUS_FMT_VYUY10_1X20               0x201b
 #define MEDIA_BUS_FMT_YUYV10_1X20               0x200d
 #define MEDIA_BUS_FMT_YVYU10_1X20               0x200e
+#define MEDIA_BUS_FMT_YUV8_1X24                 0x2024
 #define MEDIA_BUS_FMT_YUV10_1X30                0x2016
 #define MEDIA_BUS_FMT_AYUV8_1X32                0x2017
 #define MEDIA_BUS_FMT_UYVY12_2X12               0x201c