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

Commit c91cc6c2 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: sensor: unified sensor driver changes"

parents 3a410b14 f873c7c3

drivers/media/platform/msm/camera_v2/sensor/Makefile

+0 −12
Original line number Diff line number Diff line
@@ -5,16 +5,4 @@ ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io 
ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/cci

obj-$(CONFIG_MSMB_CAMERA) += cci/ io/ csiphy/ csid/ actuator/ flash/ eeprom/ ois/

obj-$(CONFIG_MSM_CAMERA_SENSOR) += msm_sensor_init.o msm_sensor_driver.o msm_sensor.o

obj-$(CONFIG_IMX132) += imx132.o

obj-$(CONFIG_IMX134) += imx134.o

obj-$(CONFIG_OV8825) += ov8825.o

obj-$(CONFIG_OV8865) += ov8865.o

obj-$(CONFIG_s5k4e1) += s5k4e1.o

obj-$(CONFIG_OV12830) += ov12830.o

obj-$(CONFIG_OV9724) += ov9724.o

obj-$(CONFIG_HI256) += hi256.o

obj-$(CONFIG_OV5648) += ov5648.o

obj-$(CONFIG_MT9M114) += mt9m114.o
 
obj-$(CONFIG_OV5645) += ov5645.o

obj-$(CONFIG_SP1628) += sp1628.o

obj-$(CONFIG_GC0339) += gc0339.o

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

+15 −82
Original line number Diff line number Diff line
@@ -73,31 +73,31 @@ static int msm_csid_cid_lut( 
		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 ||

			csid_lut_params->vc_cfg[i]->dt > 0x37) {

			csid_lut_params->vc_cfg[i].dt,

			csid_lut_params->vc_cfg[i].decode_format);

		if (csid_lut_params->vc_cfg[i].dt < 0x12 ||

			csid_lut_params->vc_cfg[i].dt > 0x37) {

			pr_err("%s: unsupported data type 0x%x\n",

				 __func__, csid_lut_params->vc_cfg[i]->dt);

				 __func__, csid_lut_params->vc_cfg[i].dt);

			return rc;

		}

		val = msm_camera_io_r(csid_dev->base +

			csid_dev->ctrl_reg->csid_reg.csid_cid_lut_vc_0_addr +

			(csid_lut_params->vc_cfg[i]->cid >> 2) * 4)

			& ~(0xFF << ((csid_lut_params->vc_cfg[i]->cid % 4) *

			(csid_lut_params->vc_cfg[i].cid >> 2) * 4)

			& ~(0xFF << ((csid_lut_params->vc_cfg[i].cid % 4) *

			8));

		val |= (csid_lut_params->vc_cfg[i]->dt <<

			((csid_lut_params->vc_cfg[i]->cid % 4) * 8));

		val |= (csid_lut_params->vc_cfg[i].dt <<

			((csid_lut_params->vc_cfg[i].cid % 4) * 8));

		msm_camera_io_w(val, csid_dev->base +

			csid_dev->ctrl_reg->csid_reg.csid_cid_lut_vc_0_addr +

			(csid_lut_params->vc_cfg[i]->cid >> 2) * 4);

			(csid_lut_params->vc_cfg[i].cid >> 2) * 4);



		val = (csid_lut_params->vc_cfg[i]->decode_format << 4) | 0x3;

		val = (csid_lut_params->vc_cfg[i].decode_format << 4) | 0x3;

		msm_camera_io_w(val, csid_dev->base +

			csid_dev->ctrl_reg->csid_reg.csid_cid_n_cfg_addr +

			(csid_lut_params->vc_cfg[i]->cid * 4));

			(csid_lut_params->vc_cfg[i].cid * 4));

	}

	return rc;

}
@@ -457,8 +457,6 @@ static int32_t msm_csid_cmd(struct csid_device *csid_dev, void __user *arg) 
		break;

	case CSID_CFG: {

		struct msm_camera_csid_params csid_params;

		struct msm_camera_csid_vc_cfg *vc_cfg = NULL;

		int8_t i = 0;

		if (copy_from_user(&csid_params,

			(void *)cdata->cfg.csid_params,

			sizeof(struct msm_camera_csid_params))) {
@@ -473,31 +471,7 @@ static int32_t msm_csid_cmd(struct csid_device *csid_dev, void __user *arg) 
			rc = -EINVAL;

			break;

		}

		for (i = 0; i < csid_params.lut_params.num_cid; i++) {

			vc_cfg = kzalloc(sizeof(struct msm_camera_csid_vc_cfg),

				GFP_KERNEL);

			if (!vc_cfg) {

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

				for (i--; i >= 0; i--)

					kfree(csid_params.lut_params.vc_cfg[i]);

				rc = -ENOMEM;

				break;

			}

			if (copy_from_user(vc_cfg,

				(void *)csid_params.lut_params.vc_cfg[i],

				sizeof(struct msm_camera_csid_vc_cfg))) {

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

				kfree(vc_cfg);

				for (i--; i >= 0; i--)

					kfree(csid_params.lut_params.vc_cfg[i]);

				rc = -EFAULT;

				break;

			}

			csid_params.lut_params.vc_cfg[i] = vc_cfg;

		}

		rc = msm_csid_config(csid_dev, &csid_params);

		for (i--; i >= 0; i--)

			kfree(csid_params.lut_params.vc_cfg[i]);

		break;

	}

	case CSID_RELEASE:
@@ -577,27 +551,14 @@ static int32_t msm_csid_cmd32(struct csid_device *csid_dev, void __user *arg) 
	case CSID_CFG: {



		struct msm_camera_csid_params csid_params;

		struct msm_camera_csid_vc_cfg *vc_cfg = NULL;

		int8_t i = 0;

		struct msm_camera_csid_lut_params32 lut_par32;

		struct msm_camera_csid_params32 csid_params32;

		struct msm_camera_csid_vc_cfg vc_cfg32;



		if (copy_from_user(&csid_params32,

		if (copy_from_user(&csid_params,

			(void *)compat_ptr(arg32->cfg.csid_params),

			sizeof(struct msm_camera_csid_params32))) {

			sizeof(struct msm_camera_csid_params))) {

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

			rc = -EFAULT;

			break;

		}



		csid_params.lane_cnt = csid_params32.lane_cnt;

		csid_params.lane_assign = csid_params32.lane_assign;

		csid_params.phy_sel = csid_params32.phy_sel;



		lut_par32 = csid_params32.lut_params;

		csid_params.lut_params.num_cid = lut_par32.num_cid;



		if (csid_params.lut_params.num_cid < 1 ||

			csid_params.lut_params.num_cid > 16) {

			pr_err("%s: %d num_cid outside range\n",
@@ -605,35 +566,7 @@ static int32_t msm_csid_cmd32(struct csid_device *csid_dev, void __user *arg) 
			rc = -EINVAL;

			break;

		}



		for (i = 0; i < lut_par32.num_cid; i++) {

			vc_cfg = kzalloc(sizeof(struct msm_camera_csid_vc_cfg),

				GFP_KERNEL);

			if (!vc_cfg) {

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

				for (i--; i >= 0; i--)

					kfree(csid_params.lut_params.vc_cfg[i]);

				rc = -ENOMEM;

				break;

			}

			/* msm_camera_csid_vc_cfg size

					does not change in COMPAT MODE */

			if (copy_from_user(&vc_cfg32,

				(void *)compat_ptr(lut_par32.vc_cfg[i]),

				sizeof(vc_cfg32))) {

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

				rc = -EFAULT;

				break;

			}

			vc_cfg->cid = vc_cfg32.cid;

			vc_cfg->dt = vc_cfg32.dt;

			vc_cfg->decode_format = vc_cfg32.decode_format;

			csid_params.lut_params.vc_cfg[i] = vc_cfg;

		}



		rc = msm_csid_config(csid_dev, &csid_params);

		for (i--; i >= 0; i--)

			kfree(csid_params.lut_params.vc_cfg[i]);

		break;

	}

	case CSID_RELEASE:

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

deleted100644 → 0
+0 −700

File deleted.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0
+0 −2156

File deleted.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0
+0 −159
Original line number Diff line number Diff line 
/* 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

 * 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 "msm_sensor.h"

#define IMX132_SENSOR_NAME "imx132"

DEFINE_MSM_MUTEX(imx132_mut);



static struct msm_sensor_ctrl_t imx132_s_ctrl;



static struct msm_sensor_power_setting imx132_power_setting[] = {

	{

		.seq_type = SENSOR_VREG,

		.seq_val = CAM_VANA,

		.config_val = 0,

		.delay = 0,

	},

	{

		.seq_type = SENSOR_VREG,

		.seq_val = CAM_VDIG,

		.config_val = 0,

		.delay = 0,

	},

	{

		.seq_type = SENSOR_VREG,

		.seq_val = CAM_VIO,

		.config_val = 0,

		.delay = 0,

	},

	{

		.seq_type = SENSOR_GPIO,

		.seq_val = SENSOR_GPIO_RESET,

		.config_val = GPIO_OUT_LOW,

		.delay = 1,

	},

	{

		.seq_type = SENSOR_GPIO,

		.seq_val = SENSOR_GPIO_RESET,

		.config_val = GPIO_OUT_HIGH,

		.delay = 5,

	},

	{

		.seq_type = SENSOR_CLK,

		.seq_val = SENSOR_CAM_MCLK,

		.config_val = 0,

		.delay = 1,

	},

	{

		.seq_type = SENSOR_I2C_MUX,

		.seq_val = 0,

		.config_val = 0,

		.delay = 0,

	},

};



static struct v4l2_subdev_info imx132_subdev_info[] = {

	{

		.code   = V4L2_MBUS_FMT_SRGGB10_1X10,

		.colorspace = V4L2_COLORSPACE_JPEG,

		.fmt    = 1,

		.order    = 0,

	},

};



static const struct i2c_device_id imx132_i2c_id[] = {

	{IMX132_SENSOR_NAME, (kernel_ulong_t)&imx132_s_ctrl},

	{ }

};



static int32_t msm_imx132_i2c_probe(struct i2c_client *client,

	const struct i2c_device_id *id)

{

	return msm_sensor_i2c_probe(client, id, &imx132_s_ctrl);

}

static struct i2c_driver imx132_i2c_driver = {

	.id_table = imx132_i2c_id,

	.probe  = msm_imx132_i2c_probe,

	.driver = {

		.name = IMX132_SENSOR_NAME,

	},

};



static struct msm_camera_i2c_client imx132_sensor_i2c_client = {

	.addr_type = MSM_CAMERA_I2C_WORD_ADDR,

};



static const struct of_device_id imx132_dt_match[] = {

	{.compatible = "qcom,imx132", .data = &imx132_s_ctrl},

	{}

};



MODULE_DEVICE_TABLE(of, imx132_dt_match);



static struct platform_driver imx132_platform_driver = {

	.driver = {

		.name = "qcom,imx132",

		.owner = THIS_MODULE,

		.of_match_table = imx132_dt_match,

	},

};



static int32_t imx132_platform_probe(struct platform_device *pdev)

{

	int32_t rc = 0;

	const struct of_device_id *match;

	match = of_match_device(imx132_dt_match, &pdev->dev);

	if (match)

		rc = msm_sensor_platform_probe(pdev, match->data);

	else {

		pr_err("%s:%d match is null\n", __func__, __LINE__);

		rc = -EINVAL;

	}

	return rc;

}



static int __init imx132_init_module(void)

{

	int32_t rc = 0;

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

	rc = platform_driver_probe(&imx132_platform_driver,

		imx132_platform_probe);

	if (!rc)

		return rc;

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

	return i2c_add_driver(&imx132_i2c_driver);

}



static void __exit imx132_exit_module(void)

{

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

	if (imx132_s_ctrl.pdev) {

		msm_sensor_free_sensor_data(&imx132_s_ctrl);

		platform_driver_unregister(&imx132_platform_driver);

	} else

		i2c_del_driver(&imx132_i2c_driver);

	return;

}



static struct msm_sensor_ctrl_t imx132_s_ctrl = {

	.sensor_i2c_client = &imx132_sensor_i2c_client,

	.power_setting_array.power_setting = imx132_power_setting,

	.power_setting_array.size = ARRAY_SIZE(imx132_power_setting),

	.msm_sensor_mutex = &imx132_mut,

	.sensor_v4l2_subdev_info = imx132_subdev_info,

	.sensor_v4l2_subdev_info_size = ARRAY_SIZE(imx132_subdev_info),

};



module_init(imx132_init_module);

module_exit(imx132_exit_module);

MODULE_DESCRIPTION("imx132");

MODULE_LICENSE("GPL v2");