UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: rkisp1: csi: Pass sensor pointer to rkisp1_csi_config() 

To prepare for the removal of the active_sensor field from the
rkisp1_device structure, pass the sensor pointer to the
rkisp1_csi_config() function instead of accessing it through
active_sensor.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Laurent Pinchart 2022-06-14 20:10:55 +01:00 committed by Mauro Carvalho Chehab
parent a81138af1d
commit c5045943cd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c
View File

@ -19,11 +19,12 @@
#include "rkisp1-common.h"
#include "rkisp1-csi.h"
static int rkisp1_csi_config(struct rkisp1_csi *csi)
static int rkisp1_csi_config(struct rkisp1_csi *csi,
struct rkisp1_sensor_async *sensor)
{
struct rkisp1_device *rkisp1 = csi->rkisp1;
const struct rkisp1_mbus_info *sink_fmt = rkisp1->isp.sink_fmt;
unsigned int lanes = rkisp1->active_sensor->lanes;
unsigned int lanes = sensor->lanes;
u32 mipi_ctrl;
if (lanes < 1 || lanes > 4)
@ -103,7 +104,7 @@ int rkisp1_csi_start(struct rkisp1_csi *csi,
s64 pixel_clock;
int ret;
ret = rkisp1_csi_config(csi);
ret = rkisp1_csi_config(csi, sensor);
if (ret)
return ret;