Merge "msm: camera: Do CSID reset during CSID release" (ecbb3684) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c

+9 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -854,6 +854,14 @@ static int msm_csid_release(struct csid_device *csid_dev)

		msm_camera_enable_irq(csid_dev->irq, false);

		if (msm_camera_tz_is_secured(
		MSM_CAMERA_TZ_IO_REGION_CSIDCORE0 + csid_dev->pdev->id) == 0) {
		msm_camera_vio_w(csid_dev->ctrl_reg->csid_reg.csid_rst_stb_all,
		csid_dev->base,
		csid_dev->ctrl_reg->csid_reg.csid_rst_cmd_addr,
		csid_dev->pdev->id);
		}

		msm_camera_clk_enable(&csid_dev->pdev->dev,
		csid_dev->csid_clk_info,
		csid_dev->csid_clk,