shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c252d35d35d09a9be3b0fb9b216304f641d1e83e'

Browse Source 
* commit 'c252d35d35d09a9be3b0fb9b216304f641d1e83e':
  media: rockchip: vicap restore sequence of sof after resume
  media: i2c: imx577: fix exp_def because exp must less than (vts - 22)

Change-Id: I6ad49593319eff382f6dcca794137400e46aceb3
This commit is contained in:
Tao Huang
2023-11-21 18:03:27 +08:00
parent 59a5456ff0 c252d35d35
commit bfb6e6cbd5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/i2c/imx577.c
View File

@@ -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,

2
drivers/media/platform/rockchip/cif/capture.c
View File

@@ -10346,6 +10346,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];