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

media: rockchip: cif: fix link to mipi and lvds is enabled at the same time

Browse Source 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I1d1006e05ffb444175c1f59fb2fdd872da748699
This commit is contained in:
Hu Kejun
2020-08-21 08:15:10 +08:00
committed by Tao Huang
parent 87cf1277ad
commit 300943521d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/platform/rockchip/cif/dev.c
View File

@@ -335,6 +335,7 @@ static int rkcif_create_links(struct rkcif_device *dev)
int ret;
u32 flags;
unsigned int s, pad, id, stream_num = 0;
bool mipi_lvds_linked = false;
if (dev->inf_id == RKCIF_MIPI_LVDS)
stream_num = RKCIF_MAX_STREAM_MIPI;
@@ -397,8 +398,8 @@ static int rkcif_create_links(struct rkcif_device *dev)
if ((dev->chip_id != CHIP_RK1808_CIF &&
dev->chip_id != CHIP_RV1126_CIF &&
dev->chip_id != CHIP_RV1126_CIF_LITE) |
(id == pad - 1))
dev->chip_id != CHIP_RV1126_CIF_LITE) ||
(id == pad - 1 && !mipi_lvds_linked))
flags = MEDIA_LNK_FL_ENABLED;
else
flags = 0;
@@ -431,6 +432,10 @@ static int rkcif_create_links(struct rkcif_device *dev)
linked_sensor.sd->name,
sensor->sd->name);
}
if (linked_sensor.mbus.type != V4L2_MBUS_BT656 &&
linked_sensor.mbus.type != V4L2_MBUS_PARALLEL)
mipi_lvds_linked = true;
}
return 0;