diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2014-02-25 12:43:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-27 12:41:10 -0800 |
| commit | 7f4392aa87448bca69aa46b185744b15106e5a13 (patch) | |
| tree | 7e201ccb74c646f72dac4f929e75978191afa5f1 | |
| parent | fe5d2e012a78b2fbfe255a8f360881fca329031f (diff) | |
imx-drm: Move IPU_PIX_FMT_GBR24 definition into imx-ipu-v3.h
The IPU display controller supports a non-standard green-red-blue ordered
format that is used on the connection between IPU display interface 1 and
the TV encoder on i.MX53.
In preparation for the move of IPU core code out of staging, place the
IPU_PIX_FMT_GBR24 definition in imx-ipu-v3.h, so that both the IPU
display interface driver and the TVE encoder driver can access it.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/imx-drm/imx-drm.h | 4 | ||||
| -rw-r--r-- | drivers/staging/imx-drm/imx-tve.c | 1 | ||||
| -rw-r--r-- | drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/imx-drm/imx-drm.h b/drivers/staging/imx-drm/imx-drm.h index aa210286668..035ab6258ad 100644 --- a/drivers/staging/imx-drm/imx-drm.h +++ b/drivers/staging/imx-drm/imx-drm.h @@ -1,10 +1,6 @@ #ifndef _IMX_DRM_H_ #define _IMX_DRM_H_ -#include <linux/videodev2.h> - -#define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3') - struct device_node; struct drm_crtc; struct drm_connector; diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c index 702c0c3204e..50b25f1a85d 100644 --- a/drivers/staging/imx-drm/imx-tve.c +++ b/drivers/staging/imx-drm/imx-tve.c @@ -31,6 +31,7 @@ #include <drm/drm_fb_helper.h> #include <drm/drm_crtc_helper.h> +#include "ipu-v3/imx-ipu-v3.h" #include "imx-drm.h" #define TVE_COM_CONF_REG 0x00 diff --git a/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h b/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h index 4826b5c0249..c4d14ead583 100644 --- a/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h +++ b/drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h @@ -25,6 +25,8 @@ enum ipuv3_type { IPUV3H, }; +#define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3') + /* * Bitfield of Display Interface signal polarities. */ |