diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-06-14 21:10:54 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-07-17 13:10:44 +0200 |
| commit | a81138af1d0ac851834e5c582ae52bcc5490ab62 (patch) | |
| tree | 82908645a60a6f788694c645e7bc4bdaa6dee6af /drivers/media | |
| parent | media: rkisp1: csi: Rename CSI functions with a common rkisp1_csi prefix (diff) | |
| download | linux-a81138af1d0ac851834e5c582ae52bcc5490ab62.tar.xz linux-a81138af1d0ac851834e5c582ae52bcc5490ab62.zip | |
media: rkisp1: csi: Move start delay to rkisp1_csi_start()
The delay in rkisp1_isp_start() is related to the CSI-2 receiver and
the camera sensor. Move it where it belongs, to rkisp1_csi_start().
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c | 7 | ||||
| -rw-r--r-- | drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c index 102deb877aa4..749ad473b877 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c @@ -9,6 +9,7 @@ * Copyright (C) 2017 Rockchip Electronics Co., Ltd. */ +#include <linux/delay.h> #include <linux/device.h> #include <linux/phy/phy.h> #include <linux/phy/phy-mipi-dphy.h> @@ -121,6 +122,12 @@ int rkisp1_csi_start(struct rkisp1_csi *csi, rkisp1_csi_enable(csi); + /* + * CIF spec says to wait for sufficient time after enabling + * the MIPI interface and before starting the sensor output. + */ + usleep_range(1000, 1200); + return 0; } diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c index d2343f166f42..da895f6aa3fa 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c @@ -365,12 +365,6 @@ static void rkisp1_isp_start(struct rkisp1_device *rkisp1) RKISP1_CIF_ISP_CTRL_ISP_ENABLE | RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE; rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val); - - /* - * CIF spec says to wait for sufficient time after enabling - * the MIPI interface and before starting the sensor output. - */ - usleep_range(1000, 1200); } /* ---------------------------------------------------------------------------- |