From cab7ed686cb4aa537e86023b5a7678c855ae703f Mon Sep 17 00:00:00 2001 From: Wang Panzhenzhuan Date: Thu, 1 Apr 2021 08:55:08 +0800 Subject: [PATCH] media: platform: rockchip: cif: distinguish multi id mode 2 & 4 According test, if sensor output 2mux mode, cif needs to be configured BT656_1120_MULTI_ID_MODE_2, nor no interrupts will be triggered. So BT656_1120_MULTI_ID_MODE_2 & BT656_1120_MULTI_ID_MODE_4 is different, distinguish it. Signed-off-by: Wang Panzhenzhuan Change-Id: I8e1959131708d2cab87ab086e03023a718f5b807 Signed-off-by: Zefa Chen --- drivers/media/platform/rockchip/cif/capture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index 66cf3e19d0c5..14a7c930defe 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -2442,10 +2442,10 @@ static int rkcif_stream_start(struct rkcif_stream *stream) else multi_id_sel = BT656_1120_MULTI_ID_SEL_MSB; - if (((bt1120_flags & RKMODULE_CAMERA_BT656_CHANNELS) >> 2) > 1) + if (((bt1120_flags & RKMODULE_CAMERA_BT656_CHANNELS) >> 2) > 3) multi_id_mode = BT656_1120_MULTI_ID_MODE_4; - else - multi_id_mode = BT656_1120_MULTI_ID_MODE_1; + else if (((bt1120_flags & RKMODULE_CAMERA_BT656_CHANNELS) >> 2) > 1) + multi_id_mode = BT656_1120_MULTI_ID_MODE_2; multi_id = DVP_SW_MULTI_ID(stream->id, stream->id, bt1120_info.id_en_bits); rkcif_write_register_or(dev, CIF_REG_DVP_MULTI_ID, multi_id);