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

Commit b9a05a13 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: cleanup debug prints"

parents cf459612 4989b00f

drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c

+1 −1
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ static int32_t msm_actuator_power_up(struct msm_actuator_ctrl_t *a_ctrl) 
	int rc = 0;

	CDBG("%s called\n", __func__);



	CDBG("vcm info: %x %x\n", a_ctrl->vcm_pwd,

	CDBG("vcm info: %d %d\n", a_ctrl->vcm_pwd,

		a_ctrl->vcm_enable);

	if (a_ctrl->vcm_enable) {

		rc = gpio_request(a_ctrl->vcm_pwd, "msm_actuator");

drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c

+8 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -292,7 +292,7 @@ static int32_t msm_cci_write_i2c_queue(struct cci_device *cci_dev, 
		pr_err("%s: failed %d", __func__, __LINE__);

		return rc;

	}

	CDBG("%s CCI_I2C_M0_Q0_LOAD_DATA_ADDR:val %x:%x\n",

	CDBG("%s CCI_I2C_M0_Q0_LOAD_DATA_ADDR:val 0x%x:0x%x\n",

		__func__, CCI_I2C_M0_Q0_LOAD_DATA_ADDR +

		reg_offset, val);

	msm_camera_io_w(val, cci_dev->base + CCI_I2C_M0_Q0_LOAD_DATA_ADDR +
@@ -398,7 +398,7 @@ static int32_t msm_cci_i2c_read(struct v4l2_subdev *sd, 


	val = msm_camera_io_r(cci_dev->base + CCI_I2C_M0_Q0_CUR_WORD_CNT_ADDR +

		master * 0x200 + queue * 0x100);

	CDBG("%s cur word cnt %x\n", __func__, val);

	CDBG("%s cur word cnt 0x%x\n", __func__, val);

	msm_camera_io_w(val, cci_dev->base + CCI_I2C_M0_Q0_EXEC_WORD_CNT_ADDR +

		master * 0x200 + queue * 0x100);
@@ -438,16 +438,16 @@ static int32_t msm_cci_i2c_read(struct v4l2_subdev *sd, 
	do {

		val = msm_camera_io_r(cci_dev->base +

			CCI_I2C_M0_READ_DATA_ADDR + master * 0x100);

		CDBG("%s read val %x\n", __func__, val);

		CDBG("%s read val 0x%x\n", __func__, val);

		for (i = 0; (i < 4) && (index < read_cfg->num_byte); i++) {

			CDBG("%s i %d index %d\n", __func__, i, index);

			if (!first_byte) {

				CDBG("%s sid %x\n", __func__, val & 0xFF);

				CDBG("%s sid 0x%x\n", __func__, val & 0xFF);

				first_byte++;

			} else {

				read_cfg->data[index] =

					(val  >> (i * 8)) & 0xFF;

				CDBG("%s data[%d] %x\n", __func__, index,

				CDBG("%s data[%d] 0x%x\n", __func__, index,

					read_cfg->data[index]);

				index++;

			}
@@ -847,13 +847,13 @@ static irqreturn_t msm_cci_irq(int irq_num, void *data) 
			cci_dev->base + CCI_RESET_CMD_ADDR);

	}

	if (irq & CCI_IRQ_STATUS_0_I2C_M0_ERROR_BMSK) {

		pr_err("%s:%d MASTER_0 error %x\n", __func__, __LINE__, irq);

		pr_err("%s:%d MASTER_0 error 0x%x\n", __func__, __LINE__, irq);

		cci_dev->cci_master_info[MASTER_0].status = -EINVAL;

		msm_camera_io_w(CCI_M0_HALT_REQ_RMSK,

			cci_dev->base + CCI_HALT_REQ_ADDR);

	}

	if (irq & CCI_IRQ_STATUS_0_I2C_M1_ERROR_BMSK) {

		pr_err("%s:%d MASTER_1 error %x\n", __func__, __LINE__, irq);

		pr_err("%s:%d MASTER_1 error 0x%x\n", __func__, __LINE__, irq);

		cci_dev->cci_master_info[MASTER_1].status = -EINVAL;

		msm_camera_io_w(CCI_M1_HALT_REQ_RMSK,

			cci_dev->base + CCI_HALT_REQ_ADDR);

drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c

+10 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -51,10 +51,11 @@ static int msm_csid_cid_lut( 
		return -EINVAL;

	}

	for (i = 0; i < csid_lut_params->num_cid && i < 16; i++) {

		CDBG("%s lut params num_cid = %d, cid = %d, dt = %x, df = %d\n",

		CDBG("%s lut params num_cid = %d, cid = %d\n",

			__func__,

			csid_lut_params->num_cid,

			csid_lut_params->vc_cfg[i]->cid,

			csid_lut_params->vc_cfg[i]->cid);

		CDBG("%s lut params dt = 0x%x, df = %d\n", __func__,

			csid_lut_params->vc_cfg[i]->dt,

			csid_lut_params->vc_cfg[i]->decode_format);

		if (csid_lut_params->vc_cfg[i]->dt < 0x12 ||
@@ -113,10 +114,11 @@ static int msm_csid_config(struct csid_device *csid_dev, 
		return -EINVAL;

	}



	CDBG("%s csid_params, lane_cnt = %d, lane_assign = %x, phy sel = %d\n",

	CDBG("%s csid_params, lane_cnt = %d, lane_assign = 0x%x\n",

		__func__,

		csid_params->lane_cnt,

		csid_params->lane_assign,

		csid_params->lane_assign);

	CDBG("%s csid_params phy_sel = %d\n", __func__,

		csid_params->phy_sel);



	msm_csid_reset(csid_dev);
@@ -240,7 +242,7 @@ static int msm_csid_init(struct csid_device *csid_dev, uint32_t *csid_version) 
	CDBG("%s:%d called\n", __func__, __LINE__);

		csid_dev->hw_version =

	msm_camera_io_r(csid_dev->base + CSID_HW_VERSION_ADDR);

	CDBG("%s:%d called csid_dev->hw_version %x\n", __func__, __LINE__,

	CDBG("%s:%d called csid_dev->hw_version 0x%x\n", __func__, __LINE__,

		csid_dev->hw_version);

	*csid_version = csid_dev->hw_version;
@@ -276,7 +278,7 @@ static int msm_csid_release(struct csid_device *csid_dev) 
		return -EINVAL;

	}



	CDBG("%s:%d, hw_version = %x\n", __func__, __LINE__,

	CDBG("%s:%d, hw_version = 0x%x\n", __func__, __LINE__,

		csid_dev->hw_version);



	irq = msm_camera_io_r(csid_dev->base + CSID_IRQ_STATUS_ADDR);
@@ -316,7 +318,7 @@ static long msm_csid_cmd(struct csid_device *csid_dev, void *arg) 
	switch (cdata->cfgtype) {

	case CSID_INIT:

		rc = msm_csid_init(csid_dev, &cdata->cfg.csid_version);

		CDBG("%s csid version %x\n", __func__,

		CDBG("%s csid version 0x%x\n", __func__,

			cdata->cfg.csid_version);

		break;

	case CSID_CFG: {

drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c

+9 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -60,11 +60,12 @@ static int msm_csiphy_lane_config(struct csiphy_device *csiphy_dev, 
		return rc;

	}



	CDBG("%s csiphy_params, mask = %x cnt = %d settle cnt = %x csid %d\n",

	CDBG("%s csiphy_params, mask = 0x%x cnt = %d\n",

		__func__,

		csiphy_params->lane_mask,

		csiphy_params->lane_cnt,

		csiphy_params->settle_cnt,

		csiphy_params->lane_cnt);

	CDBG("%s csiphy_params, settle cnt = 0x%x csid %d\n",

		__func__, csiphy_params->settle_cnt,

		csiphy_params->csid_core);



	if (csiphy_dev->hw_version >= CSIPHY_VERSION_V30) {
@@ -263,7 +264,7 @@ static int msm_csiphy_init(struct csiphy_device *csiphy_dev) 
	else

		csiphy_dev->hw_version = CSIPHY_VERSION;



	CDBG("%s:%d called csiphy_dev->hw_version %x\n", __func__, __LINE__,

	CDBG("%s:%d called csiphy_dev->hw_version 0x%x\n", __func__, __LINE__,

		csiphy_dev->hw_version);

	csiphy_dev->csiphy_state = CSIPHY_POWER_UP;

	return 0;
@@ -359,7 +360,7 @@ static int msm_csiphy_init(struct csiphy_device *csiphy_dev) 
	else

		csiphy_dev->hw_version = CSIPHY_VERSION;



	CDBG("%s:%d called csiphy_dev->hw_version %x\n", __func__, __LINE__,

	CDBG("%s:%d called csiphy_dev->hw_version 0x%x\n", __func__, __LINE__,

		csiphy_dev->hw_version);

	csiphy_dev->csiphy_state = CSIPHY_POWER_UP;

	return 0;
@@ -398,7 +399,7 @@ static int msm_csiphy_release(struct csiphy_device *csiphy_dev, void *arg) 
		}

		csi_lane_mask = (csi_lane_params->csi_lane_mask & 0x1F);



		CDBG("%s csiphy_params, lane assign %x mask = %x\n",

		CDBG("%s csiphy_params, lane assign 0x%x mask = 0x%x\n",

			__func__,

			csi_lane_params->csi_lane_assign,

			csi_lane_params->csi_lane_mask);
@@ -481,7 +482,7 @@ static int msm_csiphy_release(struct csiphy_device *csiphy_dev, void *arg) 
		}

		csi_lane_mask = (csi_lane_params->csi_lane_mask & 0x1F);



		CDBG("%s csiphy_params, lane assign %x mask = %x\n",

		CDBG("%s csiphy_params, lane assign 0x%x mask = 0x%x\n",

			__func__,

			csi_lane_params->csi_lane_assign,

			csi_lane_params->csi_lane_mask);

drivers/media/platform/msm/camera_v2/sensor/gc0339.c

+4 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -474,13 +474,13 @@ int32_t gc0339_config(struct msm_sensor_ctrl_t *s_ctrl, 
			rc = -EFAULT;

			break;

		}

		CDBG("%s sensor id %x\n", __func__,

		CDBG("%s sensor id 0x%x\n", __func__,

			sensor_slave_info.slave_addr);

		CDBG("%s sensor addr type %d\n", __func__,

			sensor_slave_info.addr_type);

		CDBG("%s sensor reg %x\n", __func__,

		CDBG("%s sensor reg 0x%x\n", __func__,

			sensor_slave_info.sensor_id_info.sensor_id_reg_addr);

		CDBG("%s sensor id %x\n", __func__,

		CDBG("%s sensor id 0x%x\n", __func__,

			sensor_slave_info.sensor_id_info.sensor_id);

		for (slave_index = 0; slave_index <

			power_setting_array->size; slave_index++) {