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

Commit b7ac375e authored by Viswanadha Raju Thotakura's avatar Viswanadha Raju Thotakura
Browse files

msm: camera: Add support for io block 



Add support for io operations layer, this layer
abstracts all the I2C and SPI common operations for
camera sensor and its associated modules.

CRs-Fixed: 2015567
Change-Id: Id30f4151b1d4e86ead187699ce694d243406f655
Signed-off-by: default avatarViswanadha Raju Thotakura <viswanad@codeaurora.org>
parent 9a3795ef

drivers/media/platform/msm/camera/cam_sensor_module/Makefile

+2 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_SPECTRA_CAMERA) += cam_sensor_utils/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_cci/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_sensor_io/

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io/Makefile

0 → 100644
+8 −0
Original line number Diff line number Diff line 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_utils

ccflags-y += -Idrivers/media/platform/msm/camera/cam_cpas/include

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_utils

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sensor_module/cam_cci

ccflags-y += -Idrivers/media/platform/msm/camera/cam_req_mgr



obj-$(CONFIG_SPECTRA_CAMERA) += cam_sensor_io.o cam_sensor_cci_i2c.o

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io/cam_sensor_cci_i2c.c

0 → 100644
+184 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include "cam_sensor_cmn_header.h"

#include "cam_sensor_i2c.h"

#include "cam_cci_dev.h"



#undef CDBG

#define CDBG(fmt, args...) pr_debug(fmt, ##args)



int32_t cam_cci_i2c_read(struct cam_sensor_cci_client *cci_client,

	uint32_t addr, uint32_t *data,

	enum camera_sensor_i2c_type addr_type,

	enum camera_sensor_i2c_type data_type)

{

	int32_t rc = -EINVAL;

	unsigned char buf[data_type];

	struct cam_cci_ctrl cci_ctrl;



	if (addr_type <= CAMERA_SENSOR_I2C_TYPE_INVALID

		|| addr_type >= CAMERA_SENSOR_I2C_TYPE_MAX

		|| data_type <= CAMERA_SENSOR_I2C_TYPE_INVALID

		|| data_type >= CAMERA_SENSOR_I2C_TYPE_MAX)

		return rc;



	cci_ctrl.cmd = MSM_CCI_I2C_READ;

	cci_ctrl.cci_info = cci_client;

	cci_ctrl.cfg.cci_i2c_read_cfg.addr = addr;

	cci_ctrl.cfg.cci_i2c_read_cfg.addr_type = addr_type;

	cci_ctrl.cfg.cci_i2c_read_cfg.data = buf;

	cci_ctrl.cfg.cci_i2c_read_cfg.num_byte = data_type;

	rc = v4l2_subdev_call(cci_client->cci_subdev,

		core, ioctl, VIDIOC_MSM_CCI_CFG, &cci_ctrl);

	if (rc < 0) {

		pr_err("%s: line %d rc = %d\n", __func__, __LINE__, rc);

		return rc;

	}

	rc = cci_ctrl.status;

	if (data_type == CAMERA_SENSOR_I2C_TYPE_BYTE)

		*data = buf[0];

	else if (data_type == CAMERA_SENSOR_I2C_TYPE_WORD)

		*data = buf[0] << 8 | buf[1];

	else if (data_type == CAMERA_SENSOR_I2C_TYPE_3B)

		*data = buf[0] << 16 | buf[1] << 8 | buf[2];

	else

		*data = buf[0] << 24 | buf[1] << 16 |

			buf[2] << 8 | buf[3];



	return rc;

}



static int32_t cam_cci_i2c_write_table_cmd(

	struct camera_io_master *client,

	struct cam_sensor_i2c_reg_setting *write_setting,

	enum cam_cci_cmd_type cmd)

{

	int32_t rc = -EINVAL;

	struct cam_cci_ctrl cci_ctrl;



	if (!client || !write_setting)

		return rc;



	if (write_setting->addr_type <= CAMERA_SENSOR_I2C_TYPE_INVALID

		|| write_setting->addr_type >= CAMERA_SENSOR_I2C_TYPE_MAX

		|| write_setting->data_type <= CAMERA_SENSOR_I2C_TYPE_INVALID

		|| write_setting->data_type >= CAMERA_SENSOR_I2C_TYPE_MAX)

		return rc;



	cci_ctrl.cmd = cmd;

	cci_ctrl.cci_info = client->cci_client;

	cci_ctrl.cfg.cci_i2c_write_cfg.reg_setting =

		write_setting->reg_setting;

	cci_ctrl.cfg.cci_i2c_write_cfg.data_type = write_setting->data_type;

	cci_ctrl.cfg.cci_i2c_write_cfg.addr_type = write_setting->addr_type;

	cci_ctrl.cfg.cci_i2c_write_cfg.size = write_setting->size;

	rc = v4l2_subdev_call(client->cci_client->cci_subdev,

		core, ioctl, VIDIOC_MSM_CCI_CFG, &cci_ctrl);

	if (rc < 0) {

		pr_err("%s: line %d rc = %d\n", __func__, __LINE__, rc);

		return rc;

	}

	rc = cci_ctrl.status;

	if (write_setting->delay > 20)

		msleep(write_setting->delay);

	else if (write_setting->delay)

		usleep_range(write_setting->delay * 1000, (write_setting->delay

			* 1000) + 1000);



	return rc;

}





int32_t cam_cci_i2c_write_table(

	struct camera_io_master *client,

	struct cam_sensor_i2c_reg_setting *write_setting)

{

	return cam_cci_i2c_write_table_cmd(client, write_setting,

		MSM_CCI_I2C_WRITE);

}



static int32_t cam_cci_i2c_compare(struct cam_sensor_cci_client *client,

	uint32_t addr, uint16_t data, uint16_t data_mask,

	enum camera_sensor_i2c_type data_type,

	enum camera_sensor_i2c_type addr_type)

{

	int32_t rc;

	uint32_t reg_data = 0;



	rc = cam_cci_i2c_read(client, addr, &reg_data,

		addr_type, data_type);

	if (rc < 0)

		return rc;



	reg_data = reg_data & 0xFFFF;

	if (data == (reg_data & ~data_mask))

		return I2C_COMPARE_MATCH;

	return I2C_COMPARE_MISMATCH;

}



int32_t cam_cci_i2c_poll(struct cam_sensor_cci_client *client,

	uint32_t addr, uint16_t data, uint16_t data_mask,

	enum camera_sensor_i2c_type data_type,

	enum camera_sensor_i2c_type addr_type,

	uint32_t delay_ms)

{

	int32_t rc = -EINVAL;

	int32_t i = 0;



	CDBG("%s: addr: 0x%x data: 0x%x dt: %d\n",

		__func__, addr, data, data_type);



	if (delay_ms > MAX_POLL_DELAY_MS) {

		pr_err("%s:%d invalid delay = %d max_delay = %d\n",

			__func__, __LINE__, delay_ms, MAX_POLL_DELAY_MS);

		return -EINVAL;

	}

	for (i = 0; i < delay_ms; i++) {

		rc = cam_cci_i2c_compare(client,

			addr, data, data_mask, data_type, addr_type);

		if (!rc) {

			pr_err("%s:%d Fail in comparing the data in poll\n",

				__func__, __LINE__);

			return rc;

		}

		usleep_range(1000, 1010);

	}



	/* If rc is 1 then read is successful but poll is failure */

	if (rc == 1)

		pr_err("%s:%d poll failed rc=%d(non-fatal)\n",

			__func__, __LINE__, rc);



	if (rc < 0)

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



	return rc;

}



int32_t cam_sensor_cci_i2c_util(struct cam_sensor_cci_client *cci_client,

	uint16_t cci_cmd)

{

	int32_t rc = 0;

	struct cam_cci_ctrl cci_ctrl;



	CDBG("%s line %d\n", __func__, __LINE__);

	cci_ctrl.cmd = cci_cmd;

	cci_ctrl.cci_info = cci_client;

	rc = v4l2_subdev_call(cci_client->cci_subdev,

		core, ioctl, VIDIOC_MSM_CCI_CFG, &cci_ctrl);

	if (rc < 0) {

		pr_err("%s line %d rc = %d\n", __func__, __LINE__, rc);

		return rc;

	}

	return cci_ctrl.status;

}

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h

0 → 100644
+78 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef _CAM_SENSOR_I2C_H_

#define _CAM_SENSOR_I2C_H_



#include <linux/delay.h>

#include <media/v4l2-subdev.h>

#include <media/cam_sensor.h>

#include <media/cam_sensor.h>

#include "cam_cci_dev.h"

#include "cam_sensor_io.h"



#define I2C_POLL_TIME_MS 5

#define MAX_POLL_DELAY_MS 100



#define I2C_COMPARE_MATCH 0

#define I2C_COMPARE_MISMATCH 1



/**

 * @client: CCI client structure

 * @data: I2C data

 * @addr_type: I2c address type

 * @data_type: I2C data type

 *

 * This API handles CCI read

 */

int32_t cam_cci_i2c_read(struct cam_sensor_cci_client *client,

	uint32_t addr, uint32_t *data,

	enum camera_sensor_i2c_type addr_type,

	enum camera_sensor_i2c_type data_type);



/**

 * @client: CCI client structure

 * @cci_cmd: CCI command type

 *

 * This API handles CCI random write

 */

int32_t cam_cci_i2c_write_table(

	struct camera_io_master *client,

	struct cam_sensor_i2c_reg_setting *write_setting);



/**

 * @cci_client: CCI client structure

 * @cci_cmd: CCI command type

 *

 * Does I2C call to I2C functionalities

 */

int32_t cam_sensor_cci_i2c_util(struct cam_sensor_cci_client *cci_client,

	uint16_t cci_cmd);



/**

 * @client: CCI client structure

 * @addr: I2C address

 * @data: I2C data

 * @data_mask: I2C data mask

 * @data_type: I2C data type

 * @addr_type: I2C addr type

 * @delay_ms: Delay in milli seconds

 *

 * This API implements CCI based I2C poll

 */

int32_t cam_cci_i2c_poll(struct cam_sensor_cci_client *client,

	uint32_t addr, uint16_t data, uint16_t data_mask,

	enum camera_sensor_i2c_type data_type,

	enum camera_sensor_i2c_type addr_type,

	uint32_t delay_ms);



#endif /* _CAM_SENSOR_I2C_H_ */

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io/cam_sensor_io.c

0 → 100644
+111 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 */



#include "cam_sensor_io.h"

#include "cam_sensor_i2c.h"



int32_t camera_io_dev_poll(struct camera_io_master *io_master_info,

	uint32_t addr, uint16_t data, uint32_t data_mask,

	enum camera_sensor_i2c_type data_type,

	enum camera_sensor_i2c_type addr_type,

	uint32_t delay_ms)

{

	int16_t mask = data_mask & 0xFF;



	if (!io_master_info) {

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

		return -EINVAL;

	}



	if (io_master_info->master_type == CCI_MASTER) {

		return cam_cci_i2c_poll(io_master_info->cci_client,

			addr, data, mask, data_type, addr_type, delay_ms);

	} else {

		pr_err("%s:%d Invalid Comm. Master:%d\n", __func__,

			__LINE__, io_master_info->master_type);

		return -EINVAL;

	}

}



int32_t camera_io_dev_read(struct camera_io_master *io_master_info,

	uint32_t addr, uint32_t *data,

	enum camera_sensor_i2c_type data_type)

{

	if (!io_master_info) {

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

		return -EINVAL;

	}



	if (io_master_info->master_type == CCI_MASTER) {

		return cam_cci_i2c_read(io_master_info->cci_client,

			addr, data, data_type, data_type);

	} else {

		pr_err("%s:%d Invalid Comm. Master:%d\n", __func__,

			__LINE__, io_master_info->master_type);

		return -EINVAL;

	}

}



int32_t camera_io_dev_write(struct camera_io_master *io_master_info,

	struct cam_sensor_i2c_reg_setting *write_setting)

{

	if (!write_setting || !io_master_info) {

		pr_err("Input parameters not valid ws: %pK ioinfo: %pK",

			write_setting, io_master_info);

		return -EINVAL;

	}



	if (io_master_info->master_type == CCI_MASTER) {

		return cam_cci_i2c_write_table(io_master_info,

			write_setting);

	} else {

		pr_err("%s:%d Invalid Comm. Master:%d\n", __func__,

			__LINE__, io_master_info->master_type);

		return -EINVAL;

	}

}



int32_t camera_io_init(struct camera_io_master *io_master_info)

{

	if (!io_master_info) {

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

		return -EINVAL;

	}



	if (io_master_info->master_type == CCI_MASTER) {

		io_master_info->cci_client->cci_subdev =

			cam_cci_get_subdev();

		return cam_sensor_cci_i2c_util(io_master_info->cci_client,

			MSM_CCI_INIT);

	} else {

		pr_err("%s:%d Invalid Comm. Master:%d\n", __func__,

			__LINE__, io_master_info->master_type);

		return -EINVAL;

	}

}



int32_t camera_io_release(struct camera_io_master *io_master_info)

{

	if (!io_master_info) {

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

		return -EINVAL;

	}



	if (io_master_info->master_type == CCI_MASTER) {

		return cam_sensor_cci_i2c_util(io_master_info->cci_client,

			MSM_CCI_RELEASE);

	} else {

		pr_err("%s:%d Invalid Comm. Master:%d\n", __func__,

			__LINE__, io_master_info->master_type);

		return -EINVAL;

	}

}