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

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

Merge "msm: camera: cpas: Disable camnoc ubwc settings for sm6150" into dev/msm-4.14-camx

parents d718c651 c20f0594
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static struct cam_camnoc_specific
			.value = 0x0,
		},
		.ubwc_ctl = {
			.enable = true,
			.enable = false,
			.access_type = CAM_REG_TYPE_READ_WRITE,
			.masked_value = 0,
			.offset = 0xd08, /* SPECIFIC_IBL_RD_DECCTL_LOW */
@@ -431,11 +431,11 @@ static struct cam_camnoc_specific
			.value = 0x0,
		},
		.ubwc_ctl = {
			.enable = true,
			.enable = false,
			.access_type = CAM_REG_TYPE_READ_WRITE,
			.masked_value = 0,
			.offset = 0x1188, /* SPECIFIC_IBL_WR_ENCCTL_LOW */
			.value = 1,
			.value = 0x5,
		},
	},
	{