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

Commit cdee08da authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Update CAMNOC IRQ settings" into msm-4.9

parents 7ef6ed70 24bf3c70

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cpastop100.h

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static struct cam_camnoc_irq_sbm cam_cpas100_irq_sbm = { 
		.access_type = CAM_REG_TYPE_WRITE,

		.enable = true,

		.offset = 0x2080, /* SBM_FLAGOUTCLR0_LOW */

		.value = TEST_IRQ_ENABLE ? 0x7 : 0x3,

		.value = TEST_IRQ_ENABLE ? 0x6 : 0x2,

	}

};
@@ -164,7 +164,7 @@ static struct cam_camnoc_irq_err 
			.access_type = CAM_REG_TYPE_READ_WRITE,

			.enable = true,

			.offset = 0x2088, /* SBM_FLAGOUTSET0_LOW */

			.value = 0x7,

			.value = 0x1,

		},

		.err_status = {

			.access_type = CAM_REG_TYPE_READ,
@@ -191,7 +191,7 @@ static struct cam_camnoc_irq_err 
			.access_type = CAM_REG_TYPE_READ_WRITE,

			.enable = true,

			.offset = 0x2088, /* SBM_FLAGOUTSET0_LOW */

			.value = 0x7,

			.value = 0x5,

		},

		.err_status = {

			.access_type = CAM_REG_TYPE_READ,