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

Commit 95b4a526 authored by Punit Soni's avatar Punit Soni Committed by Stephen Boyd
Browse files

msm: camera: add i2c API with slave address 



Currently sensor always uses the slave address specified in the device
tree. This API enables read/write to arbitrary slave address through i2c or
CCI.

Change-Id: I5d070ac97abf598ab4ed1d902374aeb1a0074aee
Signed-off-by: default avatarPunit Soni <punits@codeaurora.org>
parent bb2e3373

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

+121 −0
Original line number Diff line number Diff line
@@ -1327,6 +1327,127 @@ int32_t msm_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, 
		kfree(reg_setting);

		break;

	}

	case CFG_SLAVE_READ_I2C: {

		struct msm_camera_i2c_read_config read_config;

		uint16_t local_data = 0;

		uint16_t orig_slave_addr = 0, read_slave_addr = 0;

		if (copy_from_user(&read_config,

			(void *)cdata->cfg.setting,

			sizeof(struct msm_camera_i2c_read_config))) {

			pr_err("%s:%d failed\n", __func__, __LINE__);

			rc = -EFAULT;

			break;

		}

		read_slave_addr = read_config.slave_addr;

		CDBG("%s:CFG_SLAVE_READ_I2C:", __func__);

		CDBG("%s:slave_addr=0x%x reg_addr=0x%x, data_type=%d\n",

			__func__, read_config.slave_addr,

			read_config.reg_addr, read_config.data_type);

		if (s_ctrl->sensor_i2c_client->cci_client) {

			orig_slave_addr =

				s_ctrl->sensor_i2c_client->cci_client->sid;

			s_ctrl->sensor_i2c_client->cci_client->sid =

				read_slave_addr >> 1;

		} else if (s_ctrl->sensor_i2c_client->client) {

			orig_slave_addr =

				s_ctrl->sensor_i2c_client->client->addr;

			s_ctrl->sensor_i2c_client->client->addr =

				read_slave_addr >> 1;

		} else {

			pr_err("%s: error: no i2c/cci client found.", __func__);

			rc = -EFAULT;

			break;

		}

		CDBG("%s:orig_slave_addr=0x%x, new_slave_addr=0x%x",

				__func__, orig_slave_addr,

				read_slave_addr >> 1);

		rc = s_ctrl->sensor_i2c_client->i2c_func_tbl->i2c_read(

				s_ctrl->sensor_i2c_client,

				read_config.reg_addr,

				&local_data, read_config.data_type);

		if (rc < 0) {

			pr_err("%s:%d: i2c_read failed\n", __func__, __LINE__);

			break;

		}

		if (copy_to_user((void __user *)read_config.data,

			(void *)&local_data, sizeof(uint16_t))) {

			pr_err("%s:%d copy failed\n", __func__, __LINE__);

			rc = -EFAULT;

			break;

		}

		break;

	}

	case CFG_SLAVE_WRITE_I2C_ARRAY: {

		struct msm_camera_i2c_array_write_config write_config;

		struct msm_camera_i2c_reg_array *reg_setting = NULL;

		uint16_t write_slave_addr = 0;

		uint16_t orig_slave_addr = 0;



		if (copy_from_user(&write_config,

			(void *)cdata->cfg.setting,

			sizeof(struct msm_camera_i2c_array_write_config))) {

			pr_err("%s:%d failed\n", __func__, __LINE__);

			rc = -EFAULT;

			break;

		}

		CDBG("%s:CFG_SLAVE_WRITE_I2C_ARRAY:", __func__);

		CDBG("%s:slave_addr=0x%x, array_size=%d\n", __func__,

			write_config.slave_addr,

			write_config.conf_array.size);

		reg_setting = kzalloc(write_config.conf_array.size *

			(sizeof(struct msm_camera_i2c_reg_array)), GFP_KERNEL);

		if (!reg_setting) {

			pr_err("%s:%d failed\n", __func__, __LINE__);

			rc = -ENOMEM;

			break;

		}

		if (copy_from_user(reg_setting,

				(void *)(write_config.conf_array.reg_setting),

				write_config.conf_array.size *

				sizeof(struct msm_camera_i2c_reg_array))) {

			pr_err("%s:%d failed\n", __func__, __LINE__);

			kfree(reg_setting);

			rc = -EFAULT;

			break;

		}

		write_config.conf_array.reg_setting = reg_setting;

		write_slave_addr = write_config.slave_addr;

		if (s_ctrl->sensor_i2c_client->cci_client) {

			orig_slave_addr =

				s_ctrl->sensor_i2c_client->cci_client->sid;

			s_ctrl->sensor_i2c_client->cci_client->sid =

				write_slave_addr >> 1;

		} else if (s_ctrl->sensor_i2c_client->client) {

			orig_slave_addr =

				s_ctrl->sensor_i2c_client->client->addr;

			s_ctrl->sensor_i2c_client->client->addr =

				write_slave_addr >> 1;

		} else {

			pr_err("%s: error: no i2c/cci client found.", __func__);

			kfree(reg_setting);

			rc = -EFAULT;

			break;

		}

		CDBG("%s:orig_slave_addr=0x%x, new_slave_addr=0x%x",

				__func__, orig_slave_addr,

				write_slave_addr >> 1);

		rc = s_ctrl->sensor_i2c_client->i2c_func_tbl->i2c_write_table(

			s_ctrl->sensor_i2c_client, &(write_config.conf_array));

		if (s_ctrl->sensor_i2c_client->cci_client) {

			s_ctrl->sensor_i2c_client->cci_client->sid =

				orig_slave_addr;

		} else if (s_ctrl->sensor_i2c_client->client) {

			s_ctrl->sensor_i2c_client->client->addr =

				orig_slave_addr;

		} else {

			pr_err("%s: error: no i2c/cci client found.", __func__);

			kfree(reg_setting);

			rc = -EFAULT;

			break;

		}

		kfree(reg_setting);

		break;

	}

	case CFG_WRITE_I2C_SEQ_ARRAY: {

		struct msm_camera_i2c_seq_reg_setting conf_array;

		struct msm_camera_i2c_seq_reg_array *reg_setting = NULL;

include/media/msm_cam_sensor.h

+14 −0
Original line number Diff line number Diff line
@@ -184,6 +184,18 @@ struct msm_camera_i2c_seq_reg_setting { 
	uint16_t delay;

};



struct msm_camera_i2c_array_write_config {

	struct msm_camera_i2c_reg_setting conf_array;

	uint16_t slave_addr;

};



struct msm_camera_i2c_read_config {

	uint16_t slave_addr;

	uint16_t reg_addr;

	enum msm_camera_i2c_data_type data_type;

	uint16_t *data;

};



struct msm_camera_csid_vc_cfg {

	uint8_t cid;

	uint8_t dt;
@@ -320,7 +332,9 @@ struct msm_eeprom_cfg_data { 


enum msm_sensor_cfg_type_t {

	CFG_SET_SLAVE_INFO,

	CFG_SLAVE_READ_I2C,

	CFG_WRITE_I2C_ARRAY,

	CFG_SLAVE_WRITE_I2C_ARRAY,

	CFG_WRITE_I2C_SEQ_ARRAY,

	CFG_POWER_UP,

	CFG_POWER_DOWN,