Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff850b06 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: icp: Avoid accessing unclocked registers" into dev/msm-4.9-camx

parents a5ba71b7 d6489c91

drivers/media/platform/msm/camera/cam_icp/hfi.c

+5 −5
Original line number Diff line number Diff line
@@ -536,6 +536,11 @@ void cam_hfi_disable_cpu(void __iomem *icp_base) 


	val = cam_io_r(icp_base + HFI_REG_A5_CSR_NSEC_RESET);

	cam_io_w_mb(val, icp_base + HFI_REG_A5_CSR_NSEC_RESET);



	cam_io_w_mb((uint32_t)ICP_INIT_REQUEST_RESET,

		icp_base + HFI_REG_HOST_ICP_INIT_REQUEST);

	cam_io_w_mb((uint32_t)INTR_DISABLE,

		g_hfi->csr_base + HFI_REG_A5_CSR_A2HOSTINTEN);

}



void cam_hfi_enable_cpu(void __iomem *icp_base)
@@ -886,11 +891,6 @@ void cam_hfi_deinit(void __iomem *icp_base) 
	g_hfi->cmd_q_state = false;

	g_hfi->msg_q_state = false;



	cam_io_w_mb((uint32_t)ICP_INIT_REQUEST_RESET,

		icp_base + HFI_REG_HOST_ICP_INIT_REQUEST);



	cam_io_w_mb((uint32_t)INTR_DISABLE,

		g_hfi->csr_base + HFI_REG_A5_CSR_A2HOSTINTEN);

	kzfree(g_hfi);

	g_hfi = NULL;