diff options
Diffstat (limited to 'drivers/staging/media/rkisp1/rkisp1-common.h')
| -rw-r--r-- | drivers/staging/media/rkisp1/rkisp1-common.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h index b291cc60de8e..0c4fe503adc9 100644 --- a/drivers/staging/media/rkisp1/rkisp1-common.h +++ b/drivers/staging/media/rkisp1/rkisp1-common.h @@ -52,13 +52,6 @@ enum rkisp1_stream_id { RKISP1_SELFPATH, }; -enum rkisp1_fmt_pix_type { - RKISP1_FMT_YUV, - RKISP1_FMT_RGB, - RKISP1_FMT_BAYER, - RKISP1_FMT_JPEG, -}; - enum rkisp1_fmt_raw_pat_type { RKISP1_RAW_RGGB = 0, RKISP1_RAW_GRBG, @@ -80,8 +73,9 @@ enum rkisp1_isp_pad { */ struct rkisp1_sensor_async { struct v4l2_async_subdev asd; - struct v4l2_mbus_config mbus; unsigned int lanes; + enum v4l2_mbus_type mbus_type; + unsigned int mbus_flags; struct v4l2_subdev *sd; struct v4l2_ctrl *pixel_rate_ctrl; struct phy *dphy; @@ -225,7 +219,7 @@ struct rkisp1_resizer { struct media_pad pads[RKISP1_ISP_PAD_MAX]; struct v4l2_subdev_pad_config pad_cfg[RKISP1_ISP_PAD_MAX]; const struct rkisp1_rsz_config *config; - enum rkisp1_fmt_pix_type fmt_type; + enum v4l2_pixel_encoding pixel_enc; struct mutex ops_lock; }; @@ -247,6 +241,7 @@ struct rkisp1_debug { * @rkisp1_capture: capture video device * @stats: ISP statistics output device * @params: ISP input parameters device + * @stream_lock: lock to serialize start/stop streaming in capture devices. */ struct rkisp1_device { void __iomem *base_addr; @@ -266,6 +261,7 @@ struct rkisp1_device { struct rkisp1_params params; struct media_pipeline pipe; struct vb2_alloc_ctx *alloc_ctx; + struct mutex stream_lock; struct rkisp1_debug debug; }; @@ -278,7 +274,7 @@ struct rkisp1_device { */ struct rkisp1_isp_mbus_info { u32 mbus_code; - enum rkisp1_fmt_pix_type fmt_type; + enum v4l2_pixel_encoding pixel_enc; u32 mipi_dt; u32 yuv_seq; u8 bus_width; |