Commit 03aedb1d authored by Hugues Fruchet's avatar Hugues Fruchet Committed by Mauro Carvalho Chehab

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: default avatarHugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent b9f343df
...@@ -64,6 +64,7 @@ static const u32 mipid02_supported_fmt_codes[] = { ...@@ -64,6 +64,7 @@ static const u32 mipid02_supported_fmt_codes[] = {
MEDIA_BUS_FMT_UYVY8_1X16, MEDIA_BUS_FMT_BGR888_1X24, 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_RGB565_2X8_LE, MEDIA_BUS_FMT_RGB565_2X8_BE,
MEDIA_BUS_FMT_YUYV8_2X8, MEDIA_BUS_FMT_UYVY8_2X8, MEDIA_BUS_FMT_YUYV8_2X8, MEDIA_BUS_FMT_UYVY8_2X8,
MEDIA_BUS_FMT_JPEG_1X8
}; };
/* regulator supplies */ /* regulator supplies */
...@@ -101,6 +102,7 @@ struct mipid02_dev { ...@@ -101,6 +102,7 @@ struct mipid02_dev {
u8 data_lane1_reg1; u8 data_lane1_reg1;
u8 mode_reg1; u8 mode_reg1;
u8 mode_reg2; u8 mode_reg2;
u8 data_selection_ctrl;
u8 data_id_rreg; u8 data_id_rreg;
u8 pix_width_ctrl; u8 pix_width_ctrl;
u8 pix_width_ctrl_emb; u8 pix_width_ctrl_emb;
...@@ -486,6 +488,7 @@ static int mipid02_configure_from_tx(struct mipid02_dev *bridge) ...@@ -486,6 +488,7 @@ static int mipid02_configure_from_tx(struct mipid02_dev *bridge)
{ {
struct v4l2_fwnode_endpoint *ep = &bridge->tx; 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 = ep->bus.parallel.bus_width;
bridge->r.pix_width_ctrl_emb = 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) if (ep->bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
...@@ -501,10 +504,15 @@ static int mipid02_configure_from_code(struct mipid02_dev *bridge) ...@@ -501,10 +504,15 @@ static int mipid02_configure_from_code(struct mipid02_dev *bridge)
u8 data_type; u8 data_type;
bridge->r.data_id_rreg = 0; bridge->r.data_id_rreg = 0;
data_type = data_type_from_code(bridge->fmt.code);
if (!data_type) if (bridge->fmt.code != MEDIA_BUS_FMT_JPEG_1X8) {
return -EINVAL; bridge->r.data_selection_ctrl |= SELECTION_MANUAL_DATA;
bridge->r.data_id_rreg = data_type;
data_type = data_type_from_code(bridge->fmt.code);
if (!data_type)
return -EINVAL;
bridge->r.data_id_rreg = data_type;
}
return 0; return 0;
} }
...@@ -588,7 +596,7 @@ static int mipid02_stream_enable(struct mipid02_dev *bridge) ...@@ -588,7 +596,7 @@ static int mipid02_stream_enable(struct mipid02_dev *bridge)
if (ret) if (ret)
goto error; goto error;
ret = mipid02_write_reg(bridge, MIPID02_DATA_SELECTION_CTRL, ret = mipid02_write_reg(bridge, MIPID02_DATA_SELECTION_CTRL,
SELECTION_MANUAL_DATA | SELECTION_MANUAL_WIDTH); bridge->r.data_selection_ctrl);
if (ret) if (ret)
goto error; goto error;
ret = mipid02_write_reg(bridge, MIPID02_PIX_WIDTH_CTRL, ret = mipid02_write_reg(bridge, MIPID02_PIX_WIDTH_CTRL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment