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

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

Merge "msm: isp: Remove camif cmd from camif_cfg"

parents 76d03286 2fdbb34c

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

+20 −32
Original line number Diff line number Diff line
@@ -474,11 +474,14 @@ static void msm_vfe40_process_violation_status( 
		return;



	if (violation_status & (1 << 0))

		pr_err("%s: camif violation\n", __func__);

		pr_err("%s: vfe %d camif violation\n", __func__,

			vfe_dev->pdev->id);

	if (violation_status & (1 << 1))

		pr_err("%s: black violation\n", __func__);

		pr_err("%s: vfe %d black violation\n", __func__,

		vfe_dev->pdev->id);

	if (violation_status & (1 << 2))

		pr_err("%s: rolloff violation\n", __func__);

		pr_err("%s: vfe %d rolloff violation\n", __func__,

		vfe_dev->pdev->id);

	if (violation_status & (1 << 3))

		pr_err("%s: demux violation\n", __func__);

	if (violation_status & (1 << 4))
@@ -535,8 +538,9 @@ static void msm_vfe40_process_error_status(struct vfe_device *vfe_dev) 
{

	uint32_t error_status1 = vfe_dev->error_info.error_mask1;

	if (error_status1 & (1 << 0))

		pr_err_ratelimited("%s: camif error status: 0x%x\n",

			__func__, vfe_dev->error_info.camif_status);

		pr_err_ratelimited("%s: vfe %d camif error status: 0x%x\n",

			__func__, vfe_dev->pdev->id,

			vfe_dev->error_info.camif_status);

	if (error_status1 & (1 << 1))

		pr_err_ratelimited("%s: stats bhist overwrite\n", __func__);

	if (error_status1 & (1 << 2))
@@ -1341,10 +1345,6 @@ static void msm_vfe40_cfg_camif(struct vfe_device *vfe_dev, 
	val |= camif_cfg->camif_input;

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



	switch (pix_cfg->input_mux) {

	case CAMIF:

		val = 0x01;

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

	if (subsample_cfg->pixel_skip || subsample_cfg->line_skip) {

		bus_sub_en = 1;

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x2F8);
@@ -1357,18 +1357,6 @@ static void msm_vfe40_cfg_camif(struct vfe_device *vfe_dev, 
			subsample_cfg->pixel_skip,

			vfe_dev->vfe_base + 0x30C);

	}

		break;

	case TESTGEN:

		val = 0x01;

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

		break;

	case EXTERNAL_READ:

		return;

	default:

		pr_err("%s: not supported input_mux %d\n",

			__func__, pix_cfg->input_mux);

		break;

	}

}



static void msm_vfe40_cfg_input_mux(struct vfe_device *vfe_dev,

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

+11 −27
Original line number Diff line number Diff line
@@ -1029,10 +1029,6 @@ static void msm_vfe44_cfg_camif(struct vfe_device *vfe_dev, 
	msm_camera_io_w(pix_cfg->input_mux << 16 | pix_cfg->pixel_pattern,

		vfe_dev->vfe_base + 0x1C);



	switch (pix_cfg->input_mux) {

	case CAMIF:

		val = 0x01;

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

	if (subsample_cfg->pixel_skip || subsample_cfg->line_skip) {

		bus_sub_en = 1;

		val = msm_camera_io_r(vfe_dev->vfe_base + 0x2F8);
@@ -1045,18 +1041,6 @@ static void msm_vfe44_cfg_camif(struct vfe_device *vfe_dev, 
			subsample_cfg->pixel_skip,

			vfe_dev->vfe_base + 0x30C);

	}

		break;

	case TESTGEN:

		val = 0x01;

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

		break;

	case EXTERNAL_READ:

		return;

	default:

		pr_err("%s: not supported input_mux %d\n",

			__func__, pix_cfg->input_mux);

		break;

	}



	first_pixel = camif_cfg->first_pixel;

	last_pixel = camif_cfg->last_pixel;