diff options
| author | Cai YiWei <cyw@rock-chips.com> | 2018-12-26 10:42:43 +0800 |
|---|---|---|
| committer | Tao Huang <huangtao@rock-chips.com> | 2018-12-27 09:16:30 +0800 |
| commit | 3826d6b7e7dc9b6d9254a3ba3f0627616146ae7f (patch) | |
| tree | 49a830c34fd99f049a46a006c43bf203add60c22 /drivers/media/platform/rockchip | |
| parent | cf8f0f9b610bae548833d71e7de3e2c1eb41479f (diff) | |
media: rockchip: isp1: isp V12 use csi2host
Change-Id: I55e83eb0b5674a968bef99227eacf1c388085844
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Diffstat (limited to 'drivers/media/platform/rockchip')
| -rw-r--r-- | drivers/media/platform/rockchip/isp1/dev.c | 3 | ||||
| -rw-r--r-- | drivers/media/platform/rockchip/isp1/rkisp1.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/rockchip/isp1/dev.c b/drivers/media/platform/rockchip/isp1/dev.c index 4739795a19f1..57c959ba37d6 100644 --- a/drivers/media/platform/rockchip/isp1/dev.c +++ b/drivers/media/platform/rockchip/isp1/dev.c @@ -618,7 +618,8 @@ static irqreturn_t rkisp1_mipi_irq_hdl(int irq, void *ctx) unsigned int mis_val; unsigned int err1, err2, err3; - if (rkisp1_dev->isp_ver == ISP_V13) { + if (rkisp1_dev->isp_ver == ISP_V13 || + rkisp1_dev->isp_ver == ISP_V12) { err1 = readl(rkisp1_dev->base_addr + CIF_ISP_CSI0_ERR1); err2 = readl(rkisp1_dev->base_addr + CIF_ISP_CSI0_ERR2); err3 = readl(rkisp1_dev->base_addr + CIF_ISP_CSI0_ERR3); diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.c b/drivers/media/platform/rockchip/isp1/rkisp1.c index 0c78beeeaaf4..822b1dbacb6a 100644 --- a/drivers/media/platform/rockchip/isp1/rkisp1.c +++ b/drivers/media/platform/rockchip/isp1/rkisp1.c @@ -408,7 +408,8 @@ static int rkisp1_config_mipi(struct rkisp1_device *dev) } } - if (dev->isp_ver == ISP_V13) { + if (dev->isp_ver == ISP_V13 || + dev->isp_ver == ISP_V12) { /* csi2host enable */ writel(1, base + CIF_ISP_CSI0_CTRL0); @@ -434,8 +435,6 @@ static int rkisp1_config_mipi(struct rkisp1_device *dev) CIF_MIPI_CTRL_CLOCKLANE_ENA; writel(mipi_ctrl, base + CIF_MIPI_CTRL); - if (dev->isp_ver == ISP_V12) - writel(0, base + CIF_ISP_CSI0_CTRL0); /* Configure Data Type and Virtual Channel */ writel(CIF_MIPI_DATA_SEL_DT(in_fmt->mipi_dt) | CIF_MIPI_DATA_SEL_VC(0), |