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

Commit 65659afd 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: Dual vfe enable write master sync"

parents af63bee4 d2c7ef95

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct msm_vfe_irq_ops { 
struct msm_vfe_axi_ops {

	void (*reload_wm)(struct vfe_device *vfe_dev, void __iomem *vfe_base,

		uint32_t reload_mask);

	void (*enable_wm)(struct vfe_device *vfe_dev,

	void (*enable_wm)(void __iomem *vfe_base,

		uint8_t wm_idx, uint8_t enable);

	int32_t (*cfg_io_format)(struct vfe_device *vfe_dev,

		enum msm_vfe_axi_stream_src stream_src,

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

+3 −3
Original line number Diff line number Diff line
@@ -676,17 +676,17 @@ static void msm_vfe32_axi_reload_wm( 
	}

}



static void msm_vfe32_axi_enable_wm(struct vfe_device *vfe_dev,

static void msm_vfe32_axi_enable_wm(void __iomem *vfe_base,

	uint8_t wm_idx, uint8_t enable)

{

	uint32_t val = msm_camera_io_r(

	   vfe_dev->vfe_base + VFE32_WM_BASE(wm_idx));

	   vfe_base + VFE32_WM_BASE(wm_idx));

	if (enable)

		val |= 0x1;

	else

		val &= ~0x1;

	msm_camera_io_w_mb(val,

		vfe_dev->vfe_base + VFE32_WM_BASE(wm_idx));

		vfe_base + VFE32_WM_BASE(wm_idx));

}



static void msm_vfe32_axi_cfg_comp_mask(struct vfe_device *vfe_dev,

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

+3 −3
Original line number Diff line number Diff line
@@ -841,17 +841,17 @@ static void msm_vfe40_axi_update_cgc_override(struct vfe_device *vfe_dev, 
	msm_camera_io_w_mb(val, vfe_dev->vfe_base + 0x974);

}



static void msm_vfe40_axi_enable_wm(struct vfe_device *vfe_dev,

static void msm_vfe40_axi_enable_wm(void __iomem *vfe_base,

	uint8_t wm_idx, uint8_t enable)

{

	uint32_t val;

	val = msm_camera_io_r(vfe_dev->vfe_base + VFE40_WM_BASE(wm_idx));

	val = msm_camera_io_r(vfe_base + VFE40_WM_BASE(wm_idx));

	if (enable)

		val |= 0x1;

	else

		val &= ~0x1;

	msm_camera_io_w_mb(val,

		vfe_dev->vfe_base + VFE40_WM_BASE(wm_idx));

		vfe_base + VFE40_WM_BASE(wm_idx));

}



static void msm_vfe40_axi_cfg_comp_mask(struct vfe_device *vfe_dev,

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

+3 −3
Original line number Diff line number Diff line
@@ -678,17 +678,17 @@ static void msm_vfe44_axi_reload_wm(struct vfe_device *vfe_dev, 
	msm_camera_io_w_mb(reload_mask, vfe_base + 0x4C);

}



static void msm_vfe44_axi_enable_wm(struct vfe_device *vfe_dev,

static void msm_vfe44_axi_enable_wm(void __iomem *vfe_base,

	uint8_t wm_idx, uint8_t enable)

{

	uint32_t val;

	val = msm_camera_io_r(vfe_dev->vfe_base + VFE44_WM_BASE(wm_idx));

	val = msm_camera_io_r(vfe_base + VFE44_WM_BASE(wm_idx));

	if (enable)

		val |= 0x1;

	else

		val &= ~0x1;

	msm_camera_io_w_mb(val,

		vfe_dev->vfe_base + VFE44_WM_BASE(wm_idx));

		vfe_base + VFE44_WM_BASE(wm_idx));

}



static void msm_vfe44_axi_update_cgc_override(struct vfe_device *vfe_dev,

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

+3 −3
Original line number Diff line number Diff line
@@ -621,18 +621,18 @@ static void msm_vfe46_axi_update_cgc_override(struct vfe_device *vfe_dev, 
	msm_camera_io_w_mb(val, vfe_dev->vfe_base + 0x3C);

}



static void msm_vfe46_axi_enable_wm(struct vfe_device *vfe_dev,

static void msm_vfe46_axi_enable_wm(void __iomem *vfe_base,

	uint8_t wm_idx, uint8_t enable)

{

	uint32_t val;



	val = msm_camera_io_r(vfe_dev->vfe_base + VFE46_WM_BASE(wm_idx));

	val = msm_camera_io_r(vfe_base + VFE46_WM_BASE(wm_idx));

	if (enable)

		val |= 0x1;

	else

		val &= ~0x1;

	msm_camera_io_w_mb(val,

		vfe_dev->vfe_base + VFE46_WM_BASE(wm_idx));

		vfe_base + VFE46_WM_BASE(wm_idx));

}



static void msm_vfe46_axi_cfg_comp_mask(struct vfe_device *vfe_dev,