aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/imx/parallel-display.c
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-12-02 11:51:36 -0500
committerPhilipp Zabel <p.zabel@pengutronix.de>2015-03-31 05:59:34 -0400
commita7c6e76feeb19de1a5cefa50ea6c0fc5ad45bbe1 (patch)
tree347d8ffa3959f23cf55ab06773feff0b36fd8975 /drivers/gpu/drm/imx/parallel-display.c
parent203508ef52e3fee93b71262928541ecea82c735d (diff)
drm/imx: switch to use media bus formats
imx-drm internally misused the V4L2_PIX_FMT constants, which are supposed to describe the pixel format of frame buffers in memory, to describe the pixel format on the bus between the display controller and the encoder hardware. Now that MEDIA_BUS_FMT constants are available to drm drivers, use those instead. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Tested-by: Emil Renner Berthing <kernel@esmil.dk>
Diffstat (limited to 'drivers/gpu/drm/imx/parallel-display.c')
-rw-r--r--drivers/gpu/drm/imx/parallel-display.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 900dda6a8e71..e645fe18c1a7 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -225,14 +225,14 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
225 ret = of_property_read_string(np, "interface-pix-fmt", &fmt); 225 ret = of_property_read_string(np, "interface-pix-fmt", &fmt);
226 if (!ret) { 226 if (!ret) {
227 if (!strcmp(fmt, "rgb24")) 227 if (!strcmp(fmt, "rgb24"))
228 imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB24; 228 imxpd->interface_pix_fmt = MEDIA_BUS_FMT_RGB888_1X24;
229 else if (!strcmp(fmt, "rgb565")) 229 else if (!strcmp(fmt, "rgb565"))
230 imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB565; 230 imxpd->interface_pix_fmt = MEDIA_BUS_FMT_RGB565_1X16;
231 else if (!strcmp(fmt, "bgr666")) 231 else if (!strcmp(fmt, "bgr666"))
232 imxpd->interface_pix_fmt = V4L2_PIX_FMT_BGR666; 232 imxpd->interface_pix_fmt = MEDIA_BUS_FMT_RGB666_1X18;
233 else if (!strcmp(fmt, "lvds666")) 233 else if (!strcmp(fmt, "lvds666"))
234 imxpd->interface_pix_fmt = 234 imxpd->interface_pix_fmt =
235 v4l2_fourcc('L', 'V', 'D', '6'); 235 MEDIA_BUS_FMT_RGB666_1X24_CPADHI;
236 } 236 }
237 237
238 panel_node = of_parse_phandle(np, "fsl,panel", 0); 238 panel_node = of_parse_phandle(np, "fsl,panel", 0);