Commit a81138af authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarDafna Hirschfeld <dafna@fastmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 0c0b9f9c

drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c

+7 −0
Original line number Diff line number Diff line
@@ -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;

}

drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

}



/* ----------------------------------------------------------------------------