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

Commit f155b0a4 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: isp: Enable SOF bits during ENABLE_CAMIF"

parents 98d22013 848b510e

drivers/media/platform/msm/camera_v2/isp/msm_isp32.c

+5 −1
Original line number Diff line number Diff line
@@ -882,8 +882,12 @@ static void msm_vfe32_update_camif_state( 
	if (update_state == NO_UPDATE)

		return;



	val = msm_camera_io_r(vfe_dev->vfe_base + 0x1E4);

	if (update_state == ENABLE_CAMIF) {

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x1C);

		val |= 0x5;

		msm_camera_io_w_mb(val, vfe_dev->vfe_base + 0x1C);



		val = msm_camera_io_r(vfe_dev->vfe_base + 0x1E4);

		bus_en =

		((vfe_dev->axi_data.src_info[

			VFE_PIX_0].raw_stream_count > 0) ? 1 : 0);

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+5 −1
Original line number Diff line number Diff line
@@ -1017,14 +1017,18 @@ static void msm_vfe40_update_camif_state(struct vfe_device *vfe_dev, 
	if (update_state == NO_UPDATE)

		return;



	val = msm_camera_io_r(vfe_dev->vfe_base + 0x2F8);

	if (update_state == ENABLE_CAMIF) {

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x28);

		val |= 0xF3;

		msm_camera_io_w_mb(val, vfe_dev->vfe_base + 0x28);



		bus_en =

			((vfe_dev->axi_data.

			src_info[VFE_PIX_0].raw_stream_count > 0) ? 1 : 0);

		vfe_en =

			((vfe_dev->axi_data.

			src_info[VFE_PIX_0].pix_stream_count > 0) ? 1 : 0);

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x2F8);

		val &= 0xFFFFFF3F;

		val = val | bus_en << 7 | vfe_en << 6;

		msm_camera_io_w(val, vfe_dev->vfe_base + 0x2F8);

drivers/media/platform/msm/camera_v2/isp/msm_isp44.c

+5 −1
Original line number Diff line number Diff line
@@ -995,14 +995,18 @@ static void msm_vfe44_update_camif_state(struct vfe_device *vfe_dev, 
	if (update_state == NO_UPDATE)

		return;



	val = msm_camera_io_r(vfe_dev->vfe_base + 0x2F8);

	if (update_state == ENABLE_CAMIF) {

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x28);

		val |= 0xF3;

		msm_camera_io_w_mb(val, vfe_dev->vfe_base + 0x28);



		bus_en =

			((vfe_dev->axi_data.

			src_info[VFE_PIX_0].raw_stream_count > 0) ? 1 : 0);

		vfe_en =

			((vfe_dev->axi_data.

			src_info[VFE_PIX_0].pix_stream_count > 0) ? 1 : 0);

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x2F8);

		val &= 0xFFFFFF3F;

		val = val | bus_en << 7 | vfe_en << 6;

		msm_camera_io_w(val, vfe_dev->vfe_base + 0x2F8);

drivers/media/platform/msm/camera_v2/isp/msm_isp46.c

+5 −1
Original line number Diff line number Diff line
@@ -947,14 +947,18 @@ static void msm_vfe46_update_camif_state(struct vfe_device *vfe_dev, 
	if (update_state == NO_UPDATE)

		return;



	val = msm_camera_io_r(vfe_dev->vfe_base + 0x3AC);

	if (update_state == ENABLE_CAMIF) {

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x5C);

		val |= 0xF3;

		msm_camera_io_w_mb(val, vfe_dev->vfe_base + 0x5C);



		bus_en =

			((vfe_dev->axi_data.

			src_info[VFE_PIX_0].raw_stream_count > 0) ? 1 : 0);

		vfe_en =

			((vfe_dev->axi_data.

			src_info[VFE_PIX_0].pix_stream_count > 0) ? 1 : 0);

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x3AC);

		val &= 0xFFFFFF3F;

		val = val | bus_en << 7 | vfe_en << 6;

		msm_camera_io_w(val, vfe_dev->vfe_base + 0x3AC);

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+5 −1
Original line number Diff line number Diff line
@@ -795,14 +795,18 @@ static void msm_vfe47_update_camif_state(struct vfe_device *vfe_dev, 
	if (update_state == NO_UPDATE)

		return;



	val = msm_camera_io_r(vfe_dev->vfe_base + 0x3AC);

	if (update_state == ENABLE_CAMIF) {

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x5C);

		val |= 0xF3;

		msm_camera_io_w_mb(val, vfe_dev->vfe_base + 0x5C);



		bus_en =

			((vfe_dev->axi_data.

			src_info[VFE_PIX_0].raw_stream_count > 0) ? 1 : 0);

		vfe_en =

			((vfe_dev->axi_data.

			src_info[VFE_PIX_0].pix_stream_count > 0) ? 1 : 0);

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x3AC);

		val &= 0xFFFFFF3F;

		val = val | bus_en << 7 | vfe_en << 6;

		msm_camera_io_w(val, vfe_dev->vfe_base + 0x3AC);