From 9e5b5dff6103510e8d92278a10cdd8526197eeca Mon Sep 17 00:00:00 2001 From: Jianwei Fan Date: Mon, 13 Nov 2023 09:45:30 +0000 Subject: [PATCH 1/2] media: i2c: imx577: fix exp_def because exp must less than (vts - 22) fix commit "9625dd4e2af2" (media: i2c: imx577: fix exposure control range according to datasheet) Change-Id: Ie0e02b553599ed969dee496767c57ebac244bce1 Signed-off-by: Jianwei Fan --- drivers/media/i2c/imx577.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/imx577.c b/drivers/media/i2c/imx577.c index 3c08848263d0..0658f4671580 100644 --- a/drivers/media/i2c/imx577.c +++ b/drivers/media/i2c/imx577.c @@ -971,7 +971,7 @@ static const struct imx577_mode supported_modes[] = { .numerator = 10000, .denominator = 300000, }, - .exp_def = 0x0c10, + .exp_def = 0x0c08, .hts_def = 0x11a0, .vts_def = 0x0c1e, .bpp = 10, @@ -991,7 +991,7 @@ static const struct imx577_mode supported_modes[] = { .numerator = 10000, .denominator = 600000, }, - .exp_def = 0x0c10, + .exp_def = 0x0c08, .hts_def = 0x11a0, .vts_def = 0x0c1e, .bpp = 10, From c252d35d35d09a9be3b0fb9b216304f641d1e83e Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Fri, 10 Nov 2023 15:56:14 +0800 Subject: [PATCH 2/2] media: rockchip: vicap restore sequence of sof after resume Signed-off-by: Zefa Chen Change-Id: I58723bd60429a5fa77982602514689c32e08d25f --- drivers/media/platform/rockchip/cif/capture.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index 499d6b879df5..27a27f1b1ae1 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -10419,6 +10419,8 @@ static int rkcif_subdevs_set_stream(struct rkcif_device *cif_dev, int on) int ret = 0; for (i = 0; i < p->num_subdevs; i++) { + if (p->subdevs[i] == terminal_sensor->sd && on) + rkcif_set_sof(cif_dev, cif_dev->stream[0].frame_idx); if (p->subdevs[i] == terminal_sensor->sd && cif_dev->is_rtt_suspend) { if (!rk_tb_mcu_is_done() && on) { cif_dev->tb_client.data = p->subdevs[i];