media: atomisp: comment-out JPEG format

This is already disabled on some parts of the code, and trying
to use it with current firmware causes an error:

[   53.799946] atomisp-isp2 0000:00:03.0: can't create streams
[   53.799962] atomisp-isp2 0000:00:03.0: __get_frame_info 1600x900 (padded to 0) returned -22

So, completely disable reporting it.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index ff8640314f651275903a58f593fce1643cbf16e3..feb75491a273620eb7a090433ebb7467af5ae952 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -1980,9 +1980,11 @@ v4l2_fmt_to_sh_fmt(u32 fmt)
                return IA_CSS_FRAME_FORMAT_RGBA888;
        case V4L2_PIX_FMT_RGB565:
                return IA_CSS_FRAME_FORMAT_RGB565;
+#if 0
        case V4L2_PIX_FMT_JPEG:
        case V4L2_PIX_FMT_CUSTOM_M10MO_RAW:
                return IA_CSS_FRAME_FORMAT_BINARY_8;
+#endif
        case V4L2_PIX_FMT_SBGGR16:
        case V4L2_PIX_FMT_SBGGR10:
        case V4L2_PIX_FMT_SGBRG10:

diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
index d92d41dd0ade3345ab57c1c6e6f8897ca54ae915..936516daec7daec19224716880a1d265d0ed95aa 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
@@ -492,23 +492,22 @@ const struct atomisp_format_bridge atomisp_output_fmts[] = {
                .mbus_code = MEDIA_BUS_FMT_BGR565_2X8_LE,
                .sh_fmt = IA_CSS_FRAME_FORMAT_RGB565,
                .description = "16 RGB 5-6-5"
+#if 0
        }, {
                .pixelformat = V4L2_PIX_FMT_JPEG,
                .depth = 8,
                .mbus_code = MEDIA_BUS_FMT_JPEG_1X8,
                .sh_fmt = IA_CSS_FRAME_FORMAT_BINARY_8,
                .description = "JPEG"
-       },
-#if 0
-       {
+       }, {
                /* This is a custom format being used by M10MO to send the RAW data */
                .pixelformat = V4L2_PIX_FMT_CUSTOM_M10MO_RAW,
                .depth = 8,
                .mbus_code = V4L2_MBUS_FMT_CUSTOM_M10MO_RAW,
                .sh_fmt = IA_CSS_FRAME_FORMAT_BINARY_8,
                .description = "Custom RAW for M10MO"
-       },
 #endif
+       },
 };
 
 const struct atomisp_format_bridge *