[media] Revert "[media] media: mx2_camera: Fix mbus format handling"

This reverts commit d509835e32bd761a2b7b446034a273da568e5573. That commit
breaks support for the generic pass-through mode in the driver for formats,
not natively supported by it. Besides due to a merge conflict it also breaks
driver compilation:

drivers/media/video/mx2_camera.c: In function 'mx2_camera_set_bus_param':
drivers/media/video/mx2_camera.c:937: error: 'pixfmt' undeclared (first use in this function)
drivers/media/video/mx2_camera.c:937: error: (Each undeclared identifier is reported only once
drivers/media/video/mx2_camera.c:937: error: for each function it appears in.)

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 5 insertions, 47 deletions

diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
index ded26b7286fa..41f9a254b245 100644
--- a/drivers/media/video/mx2_camera.c
+++ b/drivers/media/video/mx2_camera.c
@@ -345,19 +345,6 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = {
                                         PRP_INTR_CH2OVF,
                 }
         },
-        {
-                .in_fmt         = V4L2_MBUS_FMT_UYVY8_2X8,
-                .out_fmt        = V4L2_PIX_FMT_YUV420,
-                .cfg            = {
-                        .channel        = 2,
-                        .in_fmt         = PRP_CNTL_DATA_IN_YUV422,
-                        .out_fmt        = PRP_CNTL_CH2_OUT_YUV420,
-                        .src_pixel      = 0x22000888, /* YUV422 (YUYV) */
-                        .irq_flags      = PRP_INTR_RDERR | PRP_INTR_CH2WERR |
-                                        PRP_INTR_CH2FC | PRP_INTR_LBOVF |
-                                        PRP_INTR_CH2OVF,
-                }
-        },
 };
 
 static struct mx2_fmt_cfg *mx27_emma_prp_get_format(
@@ -984,7 +971,6 @@ static int mx2_camera_set_bus_param(struct soc_camera_device *icd)
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         struct mx2_camera_dev *pcdev = ici->priv;
         struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
-        const struct soc_camera_format_xlate *xlate;
         unsigned long common_flags;
         int ret;
         int bytesperline;
@@ -1029,31 +1015,14 @@ static int mx2_camera_set_bus_param(struct soc_camera_device *icd)
                 return ret;
         }
 
-        xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
-        if (!xlate) {
-                dev_warn(icd->parent, "Format %x not found\n", pixfmt);
-                return -EINVAL;
-        }
-
-        if (xlate->code == V4L2_MBUS_FMT_YUYV8_2X8) {
-                csicr1 |= CSICR1_PACK_DIR;
-                csicr1 &= ~CSICR1_SWAP16_EN;
-                dev_dbg(icd->parent, "already yuyv format, don't convert\n");
-        } else if (xlate->code == V4L2_MBUS_FMT_UYVY8_2X8) {
-                csicr1 &= ~CSICR1_PACK_DIR;
-                csicr1 |= CSICR1_SWAP16_EN;
-                dev_dbg(icd->parent, "convert uyvy mbus format into yuyv\n");
-        } else {
-                dev_warn(icd->parent, "mbus format not supported\n");
-                return -EINVAL;
-        }
-
         if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
                 csicr1 |= CSICR1_REDGE;
         if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
                 csicr1 |= CSICR1_SOF_POL;
         if (common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
                 csicr1 |= CSICR1_HSYNC_POL;
+        if (pcdev->platform_flags & MX2_CAMERA_SWAP16)
+                csicr1 |= CSICR1_SWAP16_EN;
         if (pcdev->platform_flags & MX2_CAMERA_EXT_VSYNC)
                 csicr1 |= CSICR1_EXT_VSYNC;
         if (pcdev->platform_flags & MX2_CAMERA_CCIR)
@@ -1064,6 +1033,8 @@ static int mx2_camera_set_bus_param(struct soc_camera_device *icd)
                 csicr1 |= CSICR1_GCLK_MODE;
         if (pcdev->platform_flags & MX2_CAMERA_INV_DATA)
                 csicr1 |= CSICR1_INV_DATA;
+        if (pcdev->platform_flags & MX2_CAMERA_PACK_DIR_MSB)
+                csicr1 |= CSICR1_PACK_DIR;
 
         pcdev->csicr1 = csicr1;
 
@@ -1138,8 +1109,7 @@ static int mx2_camera_get_formats(struct soc_camera_device *icd,
                 return 0;
         }
 
-        if (code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-            code == V4L2_MBUS_FMT_UYVY8_2X8) {
+        if (code == V4L2_MBUS_FMT_YUYV8_2X8) {
                 formats++;
                 if (xlate) {
                         /*
@@ -1155,18 +1125,6 @@ static int mx2_camera_get_formats(struct soc_camera_device *icd,
                 }
         }
 
-        if (code == V4L2_MBUS_FMT_UYVY8_2X8) {
-                formats++;
-                if (xlate) {
-                        xlate->host_fmt =
-                                soc_mbus_get_fmtdesc(V4L2_MBUS_FMT_YUYV8_2X8);
-                        xlate->code     = code;
-                        dev_dbg(dev, "Providing host format %s for sensor code %d\n",
-                                xlate->host_fmt->name, code);
-                        xlate++;
-                }
-        }
-
         /* Generic pass-trough */
         formats++;
         if (xlate) {