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

Commit 6da42e65 authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: csid: Clear CSID top irq mask before reset" into dev/msm-4.14-camx

parents 8dfda7f1 6e8d700c

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+4 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-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
@@ -2835,6 +2835,9 @@ static int cam_ife_csid_reset_retain_sw_reg( 
	cam_io_w_mb(1, soc_info->reg_map[0].mem_base +

		csid_reg->cmn_reg->csid_irq_cmd_addr);



	cam_io_w_mb(0, soc_info->reg_map[0].mem_base +

		csid_reg->cmn_reg->csid_top_irq_mask_addr);



	cam_io_w_mb(csid_reg->cmn_reg->csid_rst_stb,

		soc_info->reg_map[0].mem_base +

		csid_reg->cmn_reg->csid_rst_strobes_addr);