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

media: rockchip: isp: fix path select of cif input

Browse Source 
Change-Id: I4c48c5cebc876fd19f4a080c1c689f8c1e06d0b9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2021-01-18 16:52:33 +08:00
committed by Tao Huang
parent 41c1b4d8ba
commit 29aa91cb2a
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/platform/rockchip/isp/rkisp.c
View File

@@ -778,19 +778,27 @@ static int rkisp_config_path(struct rkisp_device *dev)
struct rkisp_sensor_info *sensor = dev->active_sensor;
u32 dpcl = readl(dev->base_addr + CIF_VI_DPCL);
if (sensor &&
(sensor->mbus.type == V4L2_MBUS_BT656 ||
sensor->mbus.type == V4L2_MBUS_PARALLEL)) {
/* isp input interface selects */
if ((sensor && sensor->mbus.type == V4L2_MBUS_CSI2) ||
dev->isp_inp & (INP_RAWRD0 | INP_RAWRD1 | INP_RAWRD2 | INP_CIF)) {
/* mipi sensor->isp or isp read from ddr */
dpcl |= CIF_VI_DPCL_IF_SEL_MIPI;
} else if (sensor &&
(sensor->mbus.type == V4L2_MBUS_BT656 ||
sensor->mbus.type == V4L2_MBUS_PARALLEL)) {
/* dvp sensor->isp */
ret = rkisp_config_dvp(dev);
dpcl |= CIF_VI_DPCL_IF_SEL_PARALLEL;
} else if ((sensor && sensor->mbus.type == V4L2_MBUS_CSI2) ||
dev->isp_inp & (INP_RAWRD0 | INP_RAWRD1 | INP_RAWRD2 | INP_CIF)) {
dpcl |= CIF_VI_DPCL_IF_SEL_MIPI;
} else if (dev->isp_inp == INP_DMARX_ISP) {
/* read from ddr, no sensor connect, debug only */
dpcl |= CIF_VI_DPCL_DMA_SW_ISP;
} else if (sensor && sensor->mbus.type == V4L2_MBUS_CCP2) {
/* lvds sensor->isp */
ret = rkisp_config_lvds(dev);
dpcl |= VI_DPCL_IF_SEL_LVDS;
} else {
v4l2_err(&dev->v4l2_dev, "Invalid input\n");
ret = -EINVAL;
}
writel(dpcl, dev->base_addr + CIF_VI_DPCL);