media: st-mipid02: add support of JPEG

Add support of JPEG pixel format.
This requires auto detection of data type from CSI-2 stream.

Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
index f9aa96f..81285b8 100644 (file)
--- a/drivers/media/i2c/st-mipid02.c
+++ b/drivers/media/i2c/st-mipid02.c
@@ -64,6 +64,7 @@ static const u32 mipid02_supported_fmt_codes[] = {
        MEDIA_BUS_FMT_UYVY8_1X16, MEDIA_BUS_FMT_BGR888_1X24,
        MEDIA_BUS_FMT_RGB565_2X8_LE, MEDIA_BUS_FMT_RGB565_2X8_BE,
        MEDIA_BUS_FMT_YUYV8_2X8, MEDIA_BUS_FMT_UYVY8_2X8,
+       MEDIA_BUS_FMT_JPEG_1X8
 };
 
 /* regulator supplies */
@@ -101,6 +102,7 @@ struct mipid02_dev {
                u8 data_lane1_reg1;
                u8 mode_reg1;
                u8 mode_reg2;
+               u8 data_selection_ctrl;
                u8 data_id_rreg;
                u8 pix_width_ctrl;
                u8 pix_width_ctrl_emb;
@@ -486,6 +488,7 @@ static int mipid02_configure_from_tx(struct mipid02_dev *bridge)
 {
        struct v4l2_fwnode_endpoint *ep = &bridge->tx;
 
+       bridge->r.data_selection_ctrl = SELECTION_MANUAL_WIDTH;
        bridge->r.pix_width_ctrl = ep->bus.parallel.bus_width;
        bridge->r.pix_width_ctrl_emb = ep->bus.parallel.bus_width;
        if (ep->bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
@@ -501,10 +504,15 @@ static int mipid02_configure_from_code(struct mipid02_dev *bridge)
        u8 data_type;
 
        bridge->r.data_id_rreg = 0;
-       data_type = data_type_from_code(bridge->fmt.code);
-       if (!data_type)
-               return -EINVAL;
-       bridge->r.data_id_rreg = data_type;
+
+       if (bridge->fmt.code != MEDIA_BUS_FMT_JPEG_1X8) {
+               bridge->r.data_selection_ctrl |= SELECTION_MANUAL_DATA;
+
+               data_type = data_type_from_code(bridge->fmt.code);
+               if (!data_type)
+                       return -EINVAL;
+               bridge->r.data_id_rreg = data_type;
+       }
 
        return 0;
 }
@@ -588,7 +596,7 @@ static int mipid02_stream_enable(struct mipid02_dev *bridge)
        if (ret)
                goto error;
        ret = mipid02_write_reg(bridge, MIPID02_DATA_SELECTION_CTRL,
-               SELECTION_MANUAL_DATA | SELECTION_MANUAL_WIDTH);
+               bridge->r.data_selection_ctrl);
        if (ret)
                goto error;
        ret = mipid02_write_reg(bridge, MIPID02_PIX_WIDTH_CTRL,