Merge "msm: camera: cpas: Enable camnoc interrupts" into dev/msm-4.14-camx (662d802b) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cam_cpastop_hw.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -336,6 +336,9 @@ static int cam_cpastop_reset_irq(struct cam_hw_info *cpas_hw)
		{
		int i;

		if (camnoc_info->irq_sbm->sbm_enable.enable == false)
		return 0;

		cam_cpas_util_reg_update(cpas_hw, CAM_CPAS_REG_CAMNOC,
		&camnoc_info->irq_sbm->sbm_clear);
		for (i = 0; i < camnoc_info->irq_err_size; i++) {
		@@ -517,6 +520,7 @@ static int cam_cpastop_poweron(struct cam_hw_info *cpas_hw)
		{
		int i;

		cam_cpastop_reset_irq(cpas_hw);
		for (i = 0; i < camnoc_info->specific_size; i++) {
		if (camnoc_info->specific[i].enable) {
		cam_cpas_util_reg_update(cpas_hw, CAM_CPAS_REG_CAMNOC,