From 65e644fc2a92f654f7e74280b1e224cfd40fd8e9 Mon Sep 17 00:00:00 2001 From: Hu Kejun Date: Wed, 2 Sep 2020 16:39:14 +0800 Subject: [PATCH] media: rockchip: isp: fix stream failure in thunderboot mode Signed-off-by: Hu Kejun Change-Id: I561737c86ccc8fada74a7ab511daae017beb091b --- drivers/media/platform/rockchip/isp/hw.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/hw.c b/drivers/media/platform/rockchip/isp/hw.c index 5baad0f89d16..77b4fa2bab5f 100644 --- a/drivers/media/platform/rockchip/isp/hw.c +++ b/drivers/media/platform/rockchip/isp/hw.c @@ -532,8 +532,7 @@ static void disable_sys_clk(struct rkisp_hw_dev *dev) disable_irq(dev->mipi_irq); } - if (!dev->is_thunderboot) - isp_config_clk(dev, false); + isp_config_clk(dev, false); for (i = dev->num_clks - 1; i >= 0; i--) if (!IS_ERR(dev->clks[i])) @@ -552,10 +551,8 @@ static int enable_sys_clk(struct rkisp_hw_dev *dev) } } - if (!dev->is_thunderboot) { - rkisp_soft_reset(dev); - isp_config_clk(dev, true); - } + rkisp_soft_reset(dev); + isp_config_clk(dev, true); if (dev->isp_ver == ISP_V12 || dev->isp_ver == ISP_V13) { /* disable csi_rx interrupt */