Merge "msm: camera: sensor: Add msm_camsensor_sdk.h" (f2548d8b) · Commits · e / devices / android_kernel_sony_msm8994

include/media/msm_cam_sensor.h

+3 −272

Original line number	Diff line number	Diff line
		@@ -4,45 +4,22 @@
		#ifdef MSM_CAMERA_BIONIC
		#include <sys/types.h>
		#endif

		#include <media/msm_camsensor_sdk.h>

		#include <linux/types.h>
		#include <linux/v4l2-mediabus.h>
		#include <linux/i2c.h>
		#ifdef CONFIG_COMPAT
		#include <linux/compat.h>
		#endif

		#define I2C_SEQ_REG_SETTING_MAX 5
		#define I2C_SEQ_REG_DATA_MAX 256
		#define MAX_CID 16

		#define MSM_SENSOR_MCLK_8HZ 8000000
		#define MSM_SENSOR_MCLK_16HZ 16000000
		#define MSM_SENSOR_MCLK_24HZ 24000000

		#define GPIO_OUT_LOW (0 << 1)
		#define GPIO_OUT_HIGH (1 << 1)

		#define CSI_EMBED_DATA 0x12
		#define CSI_RESERVED_DATA_0 0x13
		#define CSI_YUV422_8 0x1E
		#define CSI_RAW8 0x2A
		#define CSI_RAW10 0x2B
		#define CSI_RAW12 0x2C

		#define CSI_DECODE_6BIT 0
		#define CSI_DECODE_8BIT 1
		#define CSI_DECODE_10BIT 2
		#define CSI_DECODE_DPCM_10_8_10 5

		#define MAX_SENSOR_NAME 32

		#define MAX_ACT_MOD_NAME_SIZE 32
		#define MAX_ACT_NAME_SIZE 32
		#define NUM_ACTUATOR_DIR 2
		#define MAX_ACTUATOR_SCENARIO 8
		#define MAX_ACTUATOR_REGION 5
		#define MAX_ACTUATOR_INIT_SET 12
		#define MAX_ACTUATOR_REG_TBL_SIZE 8
		#define MAX_ACTUATOR_AF_TOTAL_STEPS 1024

		#define MAX_OIS_MOD_NAME_SIZE 32
		@@ -61,12 +38,6 @@
		#define MAX_NUMBER_OF_STEPS 47

		#define MAX_LED_TRIGGERS 3
		#define MAX_POWER_CONFIG 12

		enum sensor_stats_type {
		YRGB,
		YYYY,
		};

		enum flash_type {
		LED_FLASH = 1,
		@@ -74,59 +45,6 @@ enum flash_type {
		GPIO_FLASH
		};

		enum msm_camera_i2c_reg_addr_type {
		MSM_CAMERA_I2C_BYTE_ADDR = 1,
		MSM_CAMERA_I2C_WORD_ADDR,
		MSM_CAMERA_I2C_3B_ADDR,
		MSM_CAMERA_I2C_ADDR_TYPE_MAX,
		};

		enum msm_camera_i2c_data_type {
		MSM_CAMERA_I2C_BYTE_DATA = 1,
		MSM_CAMERA_I2C_WORD_DATA,
		MSM_CAMERA_I2C_DWORD_DATA,
		MSM_CAMERA_I2C_SET_BYTE_MASK,
		MSM_CAMERA_I2C_UNSET_BYTE_MASK,
		MSM_CAMERA_I2C_SET_WORD_MASK,
		MSM_CAMERA_I2C_UNSET_WORD_MASK,
		MSM_CAMERA_I2C_SET_BYTE_WRITE_MASK_DATA,
		MSM_CAMERA_I2C_DATA_TYPE_MAX,
		};

		enum msm_sensor_power_seq_type_t {
		SENSOR_CLK,
		SENSOR_GPIO,
		SENSOR_VREG,
		SENSOR_I2C_MUX,
		};

		enum msm_sensor_clk_type_t {
		SENSOR_CAM_MCLK,
		SENSOR_CAM_CLK,
		SENSOR_CAM_CLK_MAX,
		};

		enum msm_sensor_power_seq_gpio_t {
		SENSOR_GPIO_RESET,
		SENSOR_GPIO_STANDBY,
		SENSOR_GPIO_AF_PWDM,
		SENSOR_GPIO_VIO,
		SENSOR_GPIO_VANA,
		SENSOR_GPIO_VDIG,
		SENSOR_GPIO_VAF,
		SENSOR_GPIO_FL_EN,
		SENSOR_GPIO_FL_NOW,
		SENSOR_GPIO_MAX,
		};

		enum msm_camera_vreg_name_t {
		CAM_VDIG,
		CAM_VIO,
		CAM_VANA,
		CAM_VAF,
		CAM_VREG_MAX,
		};

		enum msm_sensor_resolution_t {
		MSM_SENSOR_RES_FULL,
		MSM_SENSOR_RES_QTR,
		@@ -240,76 +158,12 @@ enum sensor_af_t {
		SENSOR_AF_NOT_FOCUSSED,
		};

		struct msm_sensor_power_setting {
		enum msm_sensor_power_seq_type_t seq_type;
		uint16_t seq_val;
		long config_val;
		uint16_t delay;
		void *data[10];
		};

		struct msm_sensor_power_setting_array {
		struct msm_sensor_power_setting power_setting_a[MAX_POWER_CONFIG];
		struct msm_sensor_power_setting *power_setting;
		uint16_t size;
		struct msm_sensor_power_setting power_down_setting_a[MAX_POWER_CONFIG];
		struct msm_sensor_power_setting *power_down_setting;
		uint16_t size_down;
		};

		struct msm_sensor_id_info_t {
		uint16_t sensor_id_reg_addr;
		uint16_t sensor_id;
		};

		enum msm_sensor_camera_id_t {
		CAMERA_0,
		CAMERA_1,
		CAMERA_2,
		CAMERA_3,
		MAX_CAMERAS,
		};

		enum cci_i2c_master_t {
		MASTER_0,
		MASTER_1,
		MASTER_MAX,
		};

		enum i2c_freq_mode_t {
		I2C_STANDARD_MODE,
		I2C_FAST_MODE,
		I2C_CUSTOM_MODE,
		I2C_MAX_MODES,
		};

		struct msm_camera_i2c_reg_array {
		uint16_t reg_addr;
		uint16_t reg_data;
		uint32_t delay;
		};

		struct msm_camera_i2c_reg_setting {
		struct msm_camera_i2c_reg_array *reg_setting;
		uint16_t size;
		enum msm_camera_i2c_reg_addr_type addr_type;
		enum msm_camera_i2c_data_type data_type;
		uint16_t delay;
		};

		struct msm_camera_i2c_seq_reg_array {
		uint16_t reg_addr;
		uint8_t reg_data[I2C_SEQ_REG_DATA_MAX];
		uint16_t reg_data_size;
		};

		struct msm_camera_i2c_seq_reg_setting {
		struct msm_camera_i2c_seq_reg_array *reg_setting;
		uint16_t size;
		enum msm_camera_i2c_reg_addr_type addr_type;
		uint16_t delay;
		};

		struct msm_camera_i2c_array_write_config {
		struct msm_camera_i2c_reg_setting conf_array;
		uint16_t slave_addr;
		@@ -322,33 +176,6 @@ struct msm_camera_i2c_read_config {
		uint16_t *data;
		};

		struct msm_camera_csid_vc_cfg {
		uint8_t cid;
		uint8_t dt;
		uint8_t decode_format;
		};

		struct msm_camera_csid_lut_params {
		uint8_t num_cid;
		struct msm_camera_csid_vc_cfg vc_cfg_a[MAX_CID];
		struct msm_camera_csid_vc_cfg *vc_cfg[MAX_CID];
		};

		struct msm_camera_csid_params {
		uint8_t lane_cnt;
		uint16_t lane_assign;
		uint8_t phy_sel;
		struct msm_camera_csid_lut_params lut_params;
		};

		struct msm_camera_csiphy_params {
		uint8_t lane_cnt;
		uint8_t settle_cnt;
		uint16_t lane_mask;
		uint8_t combo_mode;
		uint8_t csid_core;
		};

		struct msm_camera_csi2_params {
		struct msm_camera_csid_params csid_params;
		struct msm_camera_csiphy_params csiphy_params;
		@@ -367,12 +194,6 @@ struct csi_lane_params_t {
		uint8_t csi_phy_sel;
		};

		enum camb_position_t {
		BACK_CAMERA_B,
		FRONT_CAMERA_B,
		INVALID_CAMERA_B,
		};

		struct msm_sensor_info_t {
		char sensor_name[MAX_SENSOR_NAME];
		uint32_t session_id;
		@@ -391,37 +212,6 @@ struct camera_vreg_t {
		uint32_t delay;
		};

		enum camerab_mode_t {
		CAMERA_MODE_2D_B = (1<<0),
		CAMERA_MODE_3D_B = (1<<1),
		CAMERA_MODE_INVALID = (1<<2),
		};

		struct msm_sensor_init_params {
		/* mask of modes supported: 2D, 3D */
		int modes_supported;
		/* sensor position: front, back */
		enum camb_position_t position;
		/* sensor mount angle */
		uint32_t sensor_mount_angle;
		};

		struct msm_camera_sensor_slave_info {
		char sensor_name[32];
		char eeprom_name[32];
		char actuator_name[32];
		char ois_name[32];
		enum msm_sensor_camera_id_t camera_id;
		uint16_t slave_addr;
		enum i2c_freq_mode_t i2c_freq_mode;
		enum msm_camera_i2c_reg_addr_type addr_type;
		struct msm_sensor_id_info_t sensor_id_info;
		struct msm_sensor_power_setting_array power_setting_array;
		uint8_t is_init_params_valid;
		struct msm_sensor_init_params sensor_init_params;
		uint8_t is_flash_supported;
		};

		struct sensorb_cfg_data {
		int cfgtype;
		union {
		@@ -673,50 +463,6 @@ struct msm_ois_set_info_t {
		struct msm_ois_params_t ois_params;
		};

		enum actuator_type {
		ACTUATOR_VCM,
		ACTUATOR_PIEZO,
		ACTUATOR_HVCM,
		};

		enum msm_actuator_data_type {
		MSM_ACTUATOR_BYTE_DATA = 1,
		MSM_ACTUATOR_WORD_DATA,
		};

		enum msm_actuator_addr_type {
		MSM_ACTUATOR_BYTE_ADDR = 1,
		MSM_ACTUATOR_WORD_ADDR,
		};

		enum msm_actuator_i2c_operation {
		MSM_ACT_WRITE = 0,
		MSM_ACT_POLL,
		};

		struct reg_settings_t {
		uint16_t reg_addr;
		enum msm_actuator_addr_type addr_type;
		uint16_t reg_data;
		enum msm_actuator_data_type data_type;
		enum msm_actuator_i2c_operation i2c_operation;
		uint32_t delay;
		};

		struct region_params_t {
		/* [0] = ForwardDirection Macro boundary
		[1] = ReverseDirection Inf boundary
		*/
		uint16_t step_bound[2];
		uint16_t code_per_step;
		};

		struct damping_params_t {
		uint32_t damping_step;
		uint32_t damping_delay;
		uint32_t hw_params;
		};

		struct msm_actuator_move_params_t {
		int8_t dir;
		int8_t sign_dir;
		@@ -814,19 +560,6 @@ struct msm_actuator_cfg_data {
		} cfg;
		};

		enum msm_actuator_write_type {
		MSM_ACTUATOR_WRITE_HW_DAMP,
		MSM_ACTUATOR_WRITE_DAC,
		};

		struct msm_actuator_reg_params_t {
		enum msm_actuator_write_type reg_write_type;
		uint32_t hw_mask;
		uint16_t reg_addr;
		uint16_t hw_shift;
		uint16_t data_shift;
		};

		enum msm_camera_led_config_t {
		MSM_CAMERA_LED_OFF,
		MSM_CAMERA_LED_LOW,
		@@ -889,8 +622,6 @@ struct sensor_init_cfg_data {
		#define VIDIOC_MSM_OIS_CFG \
		_IOWR('V', BASE_VIDIOC_PRIVATE + 11, struct msm_ois_cfg_data)

		#define MSM_V4L2_PIX_FMT_META v4l2_fourcc('M', 'E', 'T', 'A') /* META */

		#ifdef CONFIG_COMPAT
		struct msm_camera_i2c_reg_setting32 {
		compat_uptr_t reg_setting;

include/media/msm_camsensor_sdk.h

0 → 100644

+274 −0

Original line number	Diff line number	Diff line
		#ifndef __LINUX_MSM_CAMSENSOR_SDK_H
		#define __LINUX_MSM_CAMSENSOR_SDK_H

		#include <linux/v4l2-mediabus.h>

		#define MAX_POWER_CONFIG 12
		#define GPIO_OUT_LOW (0 << 1)
		#define GPIO_OUT_HIGH (1 << 1)
		#define CSI_EMBED_DATA 0x12
		#define CSI_RESERVED_DATA_0 0x13
		#define CSI_YUV422_8 0x1E
		#define CSI_RAW8 0x2A
		#define CSI_RAW10 0x2B
		#define CSI_RAW12 0x2C
		#define CSI_DECODE_6BIT 0
		#define CSI_DECODE_8BIT 1
		#define CSI_DECODE_10BIT 2
		#define CSI_DECODE_DPCM_10_8_10 5
		#define MAX_CID 16
		#define I2C_SEQ_REG_DATA_MAX 256
		#define MSM_V4L2_PIX_FMT_META v4l2_fourcc('M', 'E', 'T', 'A') /* META */

		#define MAX_ACTUATOR_REG_TBL_SIZE 8
		#define MAX_ACTUATOR_REGION 5
		#define NUM_ACTUATOR_DIR 2
		#define MAX_ACTUATOR_SCENARIO 8
		#define MAX_ACT_MOD_NAME_SIZE 32
		#define MAX_ACT_NAME_SIZE 32
		#define MAX_ACTUATOR_INIT_SET 12

		enum msm_sensor_camera_id_t {
		CAMERA_0,
		CAMERA_1,
		CAMERA_2,
		CAMERA_3,
		MAX_CAMERAS,
		};

		enum i2c_freq_mode_t {
		I2C_STANDARD_MODE,
		I2C_FAST_MODE,
		I2C_CUSTOM_MODE,
		I2C_MAX_MODES,
		};

		enum camb_position_t {
		BACK_CAMERA_B,
		FRONT_CAMERA_B,
		INVALID_CAMERA_B,
		};

		enum msm_sensor_power_seq_type_t {
		SENSOR_CLK,
		SENSOR_GPIO,
		SENSOR_VREG,
		SENSOR_I2C_MUX,
		};

		enum msm_camera_i2c_reg_addr_type {
		MSM_CAMERA_I2C_BYTE_ADDR = 1,
		MSM_CAMERA_I2C_WORD_ADDR,
		MSM_CAMERA_I2C_3B_ADDR,
		MSM_CAMERA_I2C_ADDR_TYPE_MAX,
		};

		enum msm_camera_i2c_data_type {
		MSM_CAMERA_I2C_BYTE_DATA = 1,
		MSM_CAMERA_I2C_WORD_DATA,
		MSM_CAMERA_I2C_DWORD_DATA,
		MSM_CAMERA_I2C_SET_BYTE_MASK,
		MSM_CAMERA_I2C_UNSET_BYTE_MASK,
		MSM_CAMERA_I2C_SET_WORD_MASK,
		MSM_CAMERA_I2C_UNSET_WORD_MASK,
		MSM_CAMERA_I2C_SET_BYTE_WRITE_MASK_DATA,
		MSM_CAMERA_I2C_DATA_TYPE_MAX,
		};

		enum msm_sensor_power_seq_gpio_t {
		SENSOR_GPIO_RESET,
		SENSOR_GPIO_STANDBY,
		SENSOR_GPIO_AF_PWDM,
		SENSOR_GPIO_VIO,
		SENSOR_GPIO_VANA,
		SENSOR_GPIO_VDIG,
		SENSOR_GPIO_VAF,
		SENSOR_GPIO_FL_EN,
		SENSOR_GPIO_FL_NOW,
		SENSOR_GPIO_MAX,
		};

		enum msm_camera_vreg_name_t {
		CAM_VDIG,
		CAM_VIO,
		CAM_VANA,
		CAM_VAF,
		CAM_VREG_MAX,
		};

		enum msm_sensor_clk_type_t {
		SENSOR_CAM_MCLK,
		SENSOR_CAM_CLK,
		SENSOR_CAM_CLK_MAX,
		};

		enum camerab_mode_t {
		CAMERA_MODE_2D_B = (1<<0),
		CAMERA_MODE_3D_B = (1<<1),
		CAMERA_MODE_INVALID = (1<<2),
		};

		enum sensor_stats_type {
		YRGB,
		YYYY,
		};

		enum msm_actuator_data_type {
		MSM_ACTUATOR_BYTE_DATA = 1,
		MSM_ACTUATOR_WORD_DATA,
		};

		enum msm_actuator_addr_type {
		MSM_ACTUATOR_BYTE_ADDR = 1,
		MSM_ACTUATOR_WORD_ADDR,
		};

		enum msm_actuator_write_type {
		MSM_ACTUATOR_WRITE_HW_DAMP,
		MSM_ACTUATOR_WRITE_DAC,
		};

		enum msm_actuator_i2c_operation {
		MSM_ACT_WRITE = 0,
		MSM_ACT_POLL,
		};

		enum actuator_type {
		ACTUATOR_VCM,
		ACTUATOR_PIEZO,
		ACTUATOR_HVCM,
		};

		struct msm_sensor_power_setting {
		enum msm_sensor_power_seq_type_t seq_type;
		uint16_t seq_val;
		long config_val;
		uint16_t delay;
		void *data[10];
		};

		struct msm_sensor_power_setting_array {
		struct msm_sensor_power_setting power_setting_a[MAX_POWER_CONFIG];
		struct msm_sensor_power_setting *power_setting;
		uint16_t size;
		struct msm_sensor_power_setting power_down_setting_a[MAX_POWER_CONFIG];
		struct msm_sensor_power_setting *power_down_setting;
		uint16_t size_down;
		};

		struct msm_sensor_init_params {
		/* mask of modes supported: 2D, 3D */
		int modes_supported;
		/* sensor position: front, back */
		enum camb_position_t position;
		/* sensor mount angle */
		uint32_t sensor_mount_angle;
		};

		struct msm_sensor_id_info_t {
		uint16_t sensor_id_reg_addr;
		uint16_t sensor_id;
		};

		struct msm_camera_sensor_slave_info {
		char sensor_name[32];
		char eeprom_name[32];
		char actuator_name[32];
		char ois_name[32];
		enum msm_sensor_camera_id_t camera_id;
		uint16_t slave_addr;
		enum i2c_freq_mode_t i2c_freq_mode;
		enum msm_camera_i2c_reg_addr_type addr_type;
		struct msm_sensor_id_info_t sensor_id_info;
		struct msm_sensor_power_setting_array power_setting_array;
		uint8_t is_init_params_valid;
		struct msm_sensor_init_params sensor_init_params;
		uint8_t is_flash_supported;
		};

		struct msm_camera_i2c_reg_array {
		uint16_t reg_addr;
		uint16_t reg_data;
		uint32_t delay;
		};

		struct msm_camera_i2c_reg_setting {
		struct msm_camera_i2c_reg_array *reg_setting;
		uint16_t size;
		enum msm_camera_i2c_reg_addr_type addr_type;
		enum msm_camera_i2c_data_type data_type;
		uint16_t delay;
		};

		struct msm_camera_csid_vc_cfg {
		uint8_t cid;
		uint8_t dt;
		uint8_t decode_format;
		};

		struct msm_camera_csid_lut_params {
		uint8_t num_cid;
		struct msm_camera_csid_vc_cfg vc_cfg_a[MAX_CID];
		struct msm_camera_csid_vc_cfg *vc_cfg[MAX_CID];
		};

		struct msm_camera_csid_params {
		uint8_t lane_cnt;
		uint16_t lane_assign;
		uint8_t phy_sel;
		struct msm_camera_csid_lut_params lut_params;
		};

		struct msm_camera_csiphy_params {
		uint8_t lane_cnt;
		uint8_t settle_cnt;
		uint16_t lane_mask;
		uint8_t combo_mode;
		uint8_t csid_core;
		};

		struct msm_camera_i2c_seq_reg_array {
		uint16_t reg_addr;
		uint8_t reg_data[I2C_SEQ_REG_DATA_MAX];
		uint16_t reg_data_size;
		};

		struct msm_camera_i2c_seq_reg_setting {
		struct msm_camera_i2c_seq_reg_array *reg_setting;
		uint16_t size;
		enum msm_camera_i2c_reg_addr_type addr_type;
		uint16_t delay;
		};

		struct msm_actuator_reg_params_t {
		enum msm_actuator_write_type reg_write_type;
		uint32_t hw_mask;
		uint16_t reg_addr;
		uint16_t hw_shift;
		uint16_t data_shift;
		};

		struct damping_params_t {
		uint32_t damping_step;
		uint32_t damping_delay;
		uint32_t hw_params;
		};

		struct region_params_t {
		/* [0] = ForwardDirection Macro boundary
		[1] = ReverseDirection Inf boundary
		*/
		uint16_t step_bound[2];
		uint16_t code_per_step;
		};

		struct reg_settings_t {
		uint16_t reg_addr;
		enum msm_actuator_addr_type addr_type;
		uint16_t reg_data;
		enum msm_actuator_data_type data_type;
		enum msm_actuator_i2c_operation i2c_operation;
		uint32_t delay;
		};

		#endif /* __LINUX_MSM_CAM_SENSOR_H */

include/uapi/media/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ header-y += msm_media_info.h
		header-y += msm_vidc.h
		header-y += msmb_camera.h
		header-y += msm_cam_sensor.h
		header-y += msm_camsensor_sdk.h
		header-y += msmb_isp.h
		header-y += msmb_ispif.h
		header-y += msmb_generic_buf_mgr.h