Revert "msm8960: update camera headers"

This reverts commit e1c9fe3f8195d664a60a04083c3f5de2402b8dee.

10 files changed, 0 insertions, 2390 deletions

diff --git a/kernel-headers/media/msm_cam_sensor.h b/kernel-headers/media/msm_cam_sensor.h
deleted file mode 100644
index 1bb2960..0000000
--- a/kernel-headers/media/msm_cam_sensor.h
+++ /dev/null
@@ -1,491 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _UAPI_MEDIA_MSM_CAM_SENSOR_H
-#define _UAPI_MEDIA_MSM_CAM_SENSOR_H
-#ifdef MSM_CAMERA_BIONIC
-#include <sys/types.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#endif
-#include <linux/types.h>
-#include <linux/v4l2-mediabus.h>
-#include <linux/i2c.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define I2C_SEQ_REG_SETTING_MAX 5
-#define I2C_SEQ_REG_DATA_MAX 20
-#define MAX_CID 16
-#define MSM_SENSOR_MCLK_8HZ 8000000
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_SENSOR_MCLK_16HZ 16000000
-#define MSM_SENSOR_MCLK_24HZ 24000000
-#define GPIO_OUT_LOW (0 << 1)
-#define GPIO_OUT_HIGH (1 << 1)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define CSI_EMBED_DATA 0x12
-#define CSI_RESERVED_DATA_0 0x13
-#define CSI_YUV422_8 0x1E
-#define CSI_RAW8 0x2A
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define CSI_RAW10 0x2B
-#define CSI_RAW12 0x2C
-#define CSI_DECODE_6BIT 0
-#define CSI_DECODE_8BIT 1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#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
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MAX_ACT_NAME_SIZE 32
-#define NUM_ACTUATOR_DIR 2
-#define MAX_ACTUATOR_SCENARIO 8
-#define MAX_ACTUATOR_REGION 5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MAX_ACTUATOR_INIT_SET 12
-#define MAX_ACTUATOR_REG_TBL_SIZE 8
-#define MOVE_NEAR 0
-#define MOVE_FAR 1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum msm_camera_i2c_reg_addr_type {
- MSM_CAMERA_I2C_BYTE_ADDR = 1,
- MSM_CAMERA_I2C_WORD_ADDR,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum msm_camera_i2c_data_type {
- MSM_CAMERA_I2C_BYTE_DATA = 1,
- MSM_CAMERA_I2C_WORD_DATA,
- MSM_CAMERA_I2C_SET_BYTE_MASK,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- 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,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-enum msm_sensor_power_seq_type_t {
- SENSOR_CLK,
- SENSOR_GPIO,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- SENSOR_VREG,
- SENSOR_I2C_MUX,
-};
-enum msm_sensor_clk_type_t {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- SENSOR_CAM_MCLK,
- SENSOR_CAM_CLK,
- SENSOR_CAM_CLK_MAX,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum msm_sensor_power_seq_gpio_t {
- SENSOR_GPIO_RESET,
- SENSOR_GPIO_STANDBY,
- SENSOR_GPIO_MAX,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-enum msm_camera_vreg_name_t {
- CAM_VDIG,
- CAM_VIO,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- CAM_VANA,
- CAM_VAF,
- CAM_VREG_MAX,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum msm_sensor_resolution_t {
- MSM_SENSOR_RES_FULL,
- MSM_SENSOR_RES_QTR,
- MSM_SENSOR_RES_2,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MSM_SENSOR_RES_3,
- MSM_SENSOR_RES_4,
- MSM_SENSOR_RES_5,
- MSM_SENSOR_RES_6,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MSM_SENSOR_RES_7,
- MSM_SENSOR_INVALID_RES,
-};
-enum sensor_sub_module_t {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- SUB_MODULE_SENSOR,
- SUB_MODULE_CHROMATIX,
- SUB_MODULE_ACTUATOR,
- SUB_MODULE_EEPROM,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- SUB_MODULE_LED_FLASH,
- SUB_MODULE_STROBE_FLASH,
- SUB_MODULE_CSIPHY,
- SUB_MODULE_CSIPHY_3D,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- SUB_MODULE_CSID,
- SUB_MODULE_CSID_3D,
- SUB_MODULE_MAX,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum csid_cfg_type_t {
- CSID_INIT,
- CSID_CFG,
- CSID_RELEASE,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-enum csiphy_cfg_type_t {
- CSIPHY_INIT,
- CSIPHY_CFG,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- CSIPHY_RELEASE,
-};
-enum camera_vreg_type {
- REG_LDO,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- REG_VS,
- REG_GPIO,
-};
-struct msm_sensor_power_setting {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- enum msm_sensor_power_seq_type_t seq_type;
- uint16_t seq_val;
- long config_val;
- uint16_t delay;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- void *data[10];
-};
-struct msm_sensor_power_setting_array {
- struct msm_sensor_power_setting *power_setting;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t size;
-};
-struct msm_sensor_id_info_t {
- uint16_t sensor_id_reg_addr;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t sensor_id;
-};
-struct msm_camera_sensor_slave_info {
- uint16_t slave_addr;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- 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;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_camera_i2c_reg_array {
- uint16_t reg_addr;
- uint16_t reg_data;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-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;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- enum msm_camera_i2c_data_type data_type;
- uint16_t delay;
-};
-struct msm_camera_i2c_seq_reg_array {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t reg_addr;
- uint8_t reg_data[I2C_SEQ_REG_DATA_MAX];
- uint16_t reg_data_size;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-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;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t delay;
-};
-struct msm_camera_csid_vc_cfg {
- uint8_t cid;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint8_t dt;
- uint8_t decode_format;
-};
-struct msm_camera_csid_lut_params {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint8_t num_cid;
- struct msm_camera_csid_vc_cfg *vc_cfg[MAX_CID];
-};
-struct msm_camera_csid_params {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint8_t lane_cnt;
- uint16_t lane_assign;
- uint8_t phy_sel;
- struct msm_camera_csid_lut_params lut_params;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_camera_csiphy_params {
- uint8_t lane_cnt;
- uint8_t settle_cnt;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t lane_mask;
- uint8_t combo_mode;
-};
-struct msm_camera_csi2_params {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct msm_camera_csid_params csid_params;
- struct msm_camera_csiphy_params csiphy_params;
-};
-struct msm_camera_csi_lane_params {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t csi_lane_assign;
- uint16_t csi_lane_mask;
-};
-struct csi_lane_params_t {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t csi_lane_assign;
- uint8_t csi_lane_mask;
- uint8_t csi_if;
- uint8_t csid_core[2];
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint8_t csi_phy_sel;
-};
-struct msm_sensor_info_t {
- char sensor_name[MAX_SENSOR_NAME];
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int32_t session_id;
- int32_t subdev_id[SUB_MODULE_MAX];
-};
-struct camera_vreg_t {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- const char *reg_name;
- enum camera_vreg_type type;
- int min_voltage;
- int max_voltage;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int op_mode;
- uint32_t delay;
-};
-enum camb_position_t {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- BACK_CAMERA_B,
- FRONT_CAMERA_B,
-};
-enum camerab_mode_t {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- CAMERA_MODE_2D_B = (1<<0),
- CAMERA_MODE_3D_B = (1<<1)
-};
-struct msm_sensor_init_params {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int modes_supported;
- enum camb_position_t position;
- uint32_t sensor_mount_angle;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct sensorb_cfg_data {
- int cfgtype;
- union {
- struct msm_sensor_info_t sensor_info;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct msm_sensor_init_params sensor_init_params;
- void *setting;
- } cfg;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct csid_cfg_data {
- enum csid_cfg_type_t cfgtype;
- union {
- uint32_t csid_version;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct msm_camera_csid_params *csid_params;
- } cfg;
-};
-struct csiphy_cfg_data {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- enum csiphy_cfg_type_t cfgtype;
- union {
- struct msm_camera_csiphy_params *csiphy_params;
- struct msm_camera_csi_lane_params *csi_lane_params;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- } cfg;
-};
-enum msm_sensor_cfg_type_t {
- CFG_SET_SLAVE_INFO,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- CFG_WRITE_I2C_ARRAY,
- CFG_WRITE_I2C_SEQ_ARRAY,
- CFG_POWER_UP,
- CFG_POWER_DOWN,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- CFG_SET_STOP_STREAM_SETTING,
- CFG_GET_SENSOR_INFO,
- CFG_GET_SENSOR_INIT_PARAMS,
- CFG_SET_INIT_SETTING,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- CFG_SET_RESOLUTION,
- CFG_SET_STOP_STREAM,
- CFG_SET_START_STREAM,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum msm_actuator_cfg_type_t {
- CFG_GET_ACTUATOR_INFO,
- CFG_SET_ACTUATOR_INFO,
- CFG_SET_DEFAULT_FOCUS,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- CFG_MOVE_FOCUS,
-};
-enum actuator_type {
- ACTUATOR_VCM,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- ACTUATOR_PIEZO,
-};
-enum msm_actuator_data_type {
- MSM_ACTUATOR_BYTE_DATA = 1,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MSM_ACTUATOR_WORD_DATA,
-};
-enum msm_actuator_addr_type {
- MSM_ACTUATOR_BYTE_ADDR = 1,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MSM_ACTUATOR_WORD_ADDR,
-};
-struct reg_settings_t {
- uint16_t reg_addr;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t reg_data;
-};
-struct region_params_t {
- uint16_t step_bound[2];
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t code_per_step;
-};
-struct damping_params_t {
- uint32_t damping_step;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t damping_delay;
- uint32_t hw_params;
-};
-struct msm_actuator_move_params_t {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int8_t dir;
- int8_t sign_dir;
- int16_t dest_step_pos;
- int32_t num_steps;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct damping_params_t *ringing_params;
-};
-struct msm_actuator_tuning_params_t {
- int16_t initial_code;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t pwd_step;
- uint16_t region_size;
- uint32_t total_steps;
- struct region_params_t *region_params;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_actuator_params_t {
- enum actuator_type act_type;
- uint8_t reg_tbl_size;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t data_size;
- uint16_t init_setting_size;
- uint32_t i2c_addr;
- enum msm_actuator_addr_type i2c_addr_type;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- enum msm_actuator_data_type i2c_data_type;
- struct msm_actuator_reg_params_t *reg_tbl_params;
- struct reg_settings_t *init_settings;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_actuator_set_info_t {
- struct msm_actuator_params_t actuator_params;
- struct msm_actuator_tuning_params_t af_tuning_params;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_actuator_get_info_t {
- uint32_t focal_length_num;
- uint32_t focal_length_den;
- uint32_t f_number_num;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t f_number_den;
- uint32_t f_pix_num;
- uint32_t f_pix_den;
- uint32_t total_f_dist_num;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t total_f_dist_den;
- uint32_t hor_view_angle_num;
- uint32_t hor_view_angle_den;
- uint32_t ver_view_angle_num;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t ver_view_angle_den;
-};
-enum af_camera_name {
- ACTUATOR_MAIN_CAM_0,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- ACTUATOR_MAIN_CAM_1,
- ACTUATOR_MAIN_CAM_2,
- ACTUATOR_MAIN_CAM_3,
- ACTUATOR_MAIN_CAM_4,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- ACTUATOR_MAIN_CAM_5,
- ACTUATOR_WEB_CAM_0,
- ACTUATOR_WEB_CAM_1,
- ACTUATOR_WEB_CAM_2,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_actuator_cfg_data {
- int cfgtype;
- uint8_t is_af_supported;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- union {
- struct msm_actuator_move_params_t move;
- struct msm_actuator_set_info_t set_info;
- struct msm_actuator_get_info_t get_info;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- enum af_camera_name cam_name;
- } cfg;
-};
-enum msm_actuator_write_type {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MSM_ACTUATOR_WRITE_HW_DAMP,
- MSM_ACTUATOR_WRITE_DAC,
-};
-struct msm_actuator_reg_params_t {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- enum msm_actuator_write_type reg_write_type;
- uint32_t hw_mask;
- uint16_t reg_addr;
- uint16_t hw_shift;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t data_shift;
-};
-enum msm_camera_led_config_t {
- MSM_CAMERA_LED_OFF,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MSM_CAMERA_LED_LOW,
- MSM_CAMERA_LED_HIGH,
- MSM_CAMERA_LED_INIT,
- MSM_CAMERA_LED_RELEASE,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_camera_led_cfg_t {
- enum msm_camera_led_config_t cfgtype;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define VIDIOC_MSM_SENSOR_CFG   _IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct sensorb_cfg_data)
-#define VIDIOC_MSM_SENSOR_RELEASE   _IO('V', BASE_VIDIOC_PRIVATE + 2)
-#define VIDIOC_MSM_SENSOR_GET_SUBDEV_ID   _IOWR('V', BASE_VIDIOC_PRIVATE + 3, uint32_t)
-#define VIDIOC_MSM_CSIPHY_IO_CFG   _IOWR('V', BASE_VIDIOC_PRIVATE + 4, struct csid_cfg_data)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define VIDIOC_MSM_CSID_IO_CFG   _IOWR('V', BASE_VIDIOC_PRIVATE + 5, struct csiphy_cfg_data)
-#define VIDIOC_MSM_ACTUATOR_CFG   _IOWR('V', BASE_VIDIOC_PRIVATE + 6, struct msm_actuator_cfg_data)
-#define VIDIOC_MSM_FLASH_LED_DATA_CFG   _IOWR('V', BASE_VIDIOC_PRIVATE + 7, struct msm_camera_led_cfg_t)
-#define MSM_V4L2_PIX_FMT_META v4l2_fourcc('M', 'E', 'T', 'A')
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_V4L2_PIX_FMT_RESERVED_0 v4l2_fourcc('R', 'E', 'S', '0')
-#endif
-
diff --git a/kernel-headers/media/msmb_camera.h b/kernel-headers/media/msmb_camera.h
deleted file mode 100644
index bd6125b..0000000
--- a/kernel-headers/media/msmb_camera.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __LINUX_MSMB_CAMERA_H
-#define __LINUX_MSMB_CAMERA_H
-#include <linux/videodev2.h>
-#include <linux/types.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#include <linux/ioctl.h>
-#define MSM_CAM_V4L2_IOCTL_NOTIFY   _IOW('V', BASE_VIDIOC_PRIVATE + 30, struct v4l2_event)
-#define MSM_CAM_V4L2_IOCTL_NOTIFY_META   _IOW('V', BASE_VIDIOC_PRIVATE + 31, struct v4l2_event)
-#define MSM_CAM_V4L2_IOCTL_CMD_ACK   _IOW('V', BASE_VIDIOC_PRIVATE + 32, struct v4l2_event)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define QCAMERA_DEVICE_GROUP_ID 1
-#define QCAMERA_VNODE_GROUP_ID 2
-#define MSM_CAMERA_NAME "msm_camera"
-#define MSM_CONFIGURATION_NAME "msm_config"
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_SUBDEV_CSIPHY 0
-#define MSM_CAMERA_SUBDEV_CSID 1
-#define MSM_CAMERA_SUBDEV_ISPIF 2
-#define MSM_CAMERA_SUBDEV_VFE 3
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_SUBDEV_AXI 4
-#define MSM_CAMERA_SUBDEV_VPE 5
-#define MSM_CAMERA_SUBDEV_SENSOR 6
-#define MSM_CAMERA_SUBDEV_ACTUATOR 7
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_SUBDEV_EEPROM 8
-#define MSM_CAMERA_SUBDEV_CPP 9
-#define MSM_CAMERA_SUBDEV_CCI 10
-#define MSM_CAMERA_SUBDEV_LED_FLASH 11
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_SUBDEV_STROBE_FLASH 12
-#define MSM_CAMERA_SUBDEV_BUF_MNGR 13
-#define MSM_MAX_CAMERA_SENSORS 5
-#define MSM_CAMERA_FEATURE_BASE 0x00010000
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_FEATURE_SHUTDOWN (MSM_CAMERA_FEATURE_BASE + 1)
-#define MSM_CAMERA_STATUS_BASE 0x00020000
-#define MSM_CAMERA_STATUS_FAIL (MSM_CAMERA_STATUS_BASE + 1)
-#define MSM_CAMERA_STATUS_SUCCESS (MSM_CAMERA_STATUS_BASE + 2)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_V4L2_EVENT_TYPE (V4L2_EVENT_PRIVATE_START + 0x00002000)
-#define MSM_CAMERA_EVENT_MIN 0
-#define MSM_CAMERA_NEW_SESSION (MSM_CAMERA_EVENT_MIN + 1)
-#define MSM_CAMERA_DEL_SESSION (MSM_CAMERA_EVENT_MIN + 2)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_SET_PARM (MSM_CAMERA_EVENT_MIN + 3)
-#define MSM_CAMERA_GET_PARM (MSM_CAMERA_EVENT_MIN + 4)
-#define MSM_CAMERA_MAPPING_CFG (MSM_CAMERA_EVENT_MIN + 5)
-#define MSM_CAMERA_MAPPING_SES (MSM_CAMERA_EVENT_MIN + 6)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_MSM_NOTIFY (MSM_CAMERA_EVENT_MIN + 7)
-#define MSM_CAMERA_EVENT_MAX (MSM_CAMERA_EVENT_MIN + 8)
-#define MSM_CAMERA_PRIV_S_CROP (V4L2_CID_PRIVATE_BASE + 1)
-#define MSM_CAMERA_PRIV_G_CROP (V4L2_CID_PRIVATE_BASE + 2)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_PRIV_G_FMT (V4L2_CID_PRIVATE_BASE + 3)
-#define MSM_CAMERA_PRIV_S_FMT (V4L2_CID_PRIVATE_BASE + 4)
-#define MSM_CAMERA_PRIV_TRY_FMT (V4L2_CID_PRIVATE_BASE + 5)
-#define MSM_CAMERA_PRIV_METADATA (V4L2_CID_PRIVATE_BASE + 6)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_PRIV_QUERY_CAP (V4L2_CID_PRIVATE_BASE + 7)
-#define MSM_CAMERA_PRIV_STREAM_ON (V4L2_CID_PRIVATE_BASE + 8)
-#define MSM_CAMERA_PRIV_STREAM_OFF (V4L2_CID_PRIVATE_BASE + 9)
-#define MSM_CAMERA_PRIV_NEW_STREAM (V4L2_CID_PRIVATE_BASE + 10)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_PRIV_DEL_STREAM (V4L2_CID_PRIVATE_BASE + 11)
-#define MSM_CAMERA_PRIV_SHUTDOWN (V4L2_CID_PRIVATE_BASE + 12)
-#define MSM_CAMERA_PRIV_STREAM_INFO_SYNC   (V4L2_CID_PRIVATE_BASE + 13)
-#define MSM_CAMERA_CMD_SUCESS 0x00000001
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_CAMERA_BUF_MAP_SUCESS 0x00000002
-#define MSM_CAMERA_ERR_EVT_BASE 0x00010000
-#define MSM_CAMERA_ERR_CMD_FAIL (MSM_CAMERA_ERR_EVT_BASE + 1)
-#define MSM_CAMERA_ERR_MAPPING (MSM_CAMERA_ERR_EVT_BASE + 2)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_v4l2_event_data {
- unsigned int command;
- unsigned int status;
- unsigned int session_id;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned int stream_id;
- unsigned int map_op;
- unsigned int map_buf_idx;
- unsigned int notify;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned int nop1;
- unsigned int nop2;
- unsigned int nop3;
- unsigned int nop4;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned int nop5;
- unsigned int nop6;
- unsigned int nop7;
- unsigned int nop8;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned int nop9;
-};
-struct msm_v4l2_format_data {
- enum v4l2_buf_type type;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned int width;
- unsigned int height;
- unsigned int pixelformat;
- unsigned char num_planes;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned int plane_sizes[VIDEO_MAX_PLANES];
-};
-#define msm_v4l2_fourcc(a, b, c, d)  ((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) |  ((__u32)(d) << 24))
-#define MSM_V4L2_PIX_FMT_STATS_COMB v4l2_fourcc('S', 'T', 'C', 'M')
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_V4L2_PIX_FMT_STATS_AE v4l2_fourcc('S', 'T', 'A', 'E')
-#define MSM_V4L2_PIX_FMT_STATS_AF v4l2_fourcc('S', 'T', 'A', 'F')
-#define MSM_V4L2_PIX_FMT_STATS_AWB v4l2_fourcc('S', 'T', 'W', 'B')
-#define MSM_V4L2_PIX_FMT_STATS_IHST v4l2_fourcc('I', 'H', 'S', 'T')
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_V4L2_PIX_FMT_STATS_CS v4l2_fourcc('S', 'T', 'C', 'S')
-#define MSM_V4L2_PIX_FMT_STATS_RS v4l2_fourcc('S', 'T', 'R', 'S')
-#define MSM_V4L2_PIX_FMT_STATS_BG v4l2_fourcc('S', 'T', 'B', 'G')
-#define MSM_V4L2_PIX_FMT_STATS_BF v4l2_fourcc('S', 'T', 'B', 'F')
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSM_V4L2_PIX_FMT_STATS_BHST v4l2_fourcc('B', 'H', 'S', 'T')
-#endif
-
diff --git a/kernel-headers/media/msmb_generic_buf_mgr.h b/kernel-headers/media/msmb_generic_buf_mgr.h
deleted file mode 100644
index c34bd19..0000000
--- a/kernel-headers/media/msmb_generic_buf_mgr.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __MEDIA_MSMB_BUF_MNGR_H__
-#define __MEDIA_MSMB_BUF_MNGR_H__
-struct msm_buf_mngr_info {
- uint32_t session_id;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t stream_id;
- uint32_t frame_id;
- struct timeval timestamp;
- uint32_t index;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-#define VIDIOC_MSM_BUF_MNGR_GET_BUF   _IOWR('V', BASE_VIDIOC_PRIVATE + 33, struct msm_buf_mngr_info)
-#define VIDIOC_MSM_BUF_MNGR_PUT_BUF   _IOWR('V', BASE_VIDIOC_PRIVATE + 34, struct msm_buf_mngr_info)
-#define VIDIOC_MSM_BUF_MNGR_BUF_DONE   _IOWR('V', BASE_VIDIOC_PRIVATE + 35, struct msm_buf_mngr_info)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#endif
-
diff --git a/kernel-headers/media/msmb_isp.h b/kernel-headers/media/msmb_isp.h
deleted file mode 100644
index e17aa23..0000000
--- a/kernel-headers/media/msmb_isp.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _UAPI_MEDIA_MSMB_ISP_H
-#define _UAPI_MEDIA_MSMB_ISP_H
-#include <linux/videodev2.h>
-#define MAX_PLANES_PER_STREAM 3
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MAX_NUM_STREAM 7
-#define ISP_VERSION_40 40
-#define ISP_VERSION_32 32
-#define ISP_NATIVE_BUF_BIT 0x10000
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ISP_STATS_STREAM_BIT 0x80000000
-enum ISP_START_PIXEL_PATTERN {
- ISP_BAYER_RGRGRG,
- ISP_BAYER_GRGRGR,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- ISP_BAYER_BGBGBG,
- ISP_BAYER_GBGBGB,
- ISP_YUV_YCbYCr,
- ISP_YUV_YCrYCb,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- ISP_YUV_CbYCrY,
- ISP_YUV_CrYCbY,
- ISP_PIX_PATTERN_MAX
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum msm_vfe_plane_fmt {
- Y_PLANE,
- CB_PLANE,
- CR_PLANE,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- CRCB_PLANE,
- CBCR_PLANE,
- VFE_PLANE_FMT_MAX
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-enum msm_vfe_input_src {
- VFE_PIX_0,
- VFE_RAW_0,
- VFE_RAW_1,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- VFE_RAW_2,
- VFE_SRC_MAX,
-};
-enum msm_vfe_axi_stream_src {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- PIX_ENCODER,
- PIX_VIEWFINDER,
- CAMIF_RAW,
- IDEAL_RAW,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- RDI_INTF_0,
- RDI_INTF_1,
- RDI_INTF_2,
- VFE_AXI_SRC_MAX
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-enum msm_vfe_frame_skip_pattern {
- NO_SKIP,
- EVERY_2FRAME,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- EVERY_3FRAME,
- EVERY_4FRAME,
- EVERY_5FRAME,
- EVERY_6FRAME,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- EVERY_7FRAME,
- EVERY_8FRAME,
- EVERY_16FRAME,
- EVERY_32FRAME,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MAX_SKIP,
-};
-enum msm_vfe_camif_input {
- CAMIF_DISABLED,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- CAMIF_PAD_REG_INPUT,
- CAMIF_MIDDI_INPUT,
- CAMIF_MIPI_INPUT,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_vfe_camif_cfg {
- uint32_t lines_per_frame;
- uint32_t pixels_per_line;
- uint32_t first_pixel;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t last_pixel;
- uint32_t first_line;
- uint32_t last_line;
- uint32_t epoch_line0;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t epoch_line1;
- enum msm_vfe_camif_input camif_input;
-};
-enum msm_vfe_inputmux {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- CAMIF,
- TESTGEN,
- EXTERNAL_READ,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_vfe_pix_cfg {
- struct msm_vfe_camif_cfg camif_cfg;
- enum msm_vfe_inputmux input_mux;
- enum ISP_START_PIXEL_PATTERN pixel_pattern;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_vfe_rdi_cfg {
- uint8_t cid;
- uint8_t frame_based;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_vfe_input_cfg {
- union {
- struct msm_vfe_pix_cfg pix_cfg;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct msm_vfe_rdi_cfg rdi_cfg;
- } d;
- enum msm_vfe_input_src input_src;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_vfe_axi_plane_cfg {
- uint32_t output_width;
- uint32_t output_height;
- uint32_t output_stride;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t output_scan_lines;
- uint32_t output_plane_format;
- uint8_t csid_src;
- uint8_t rdi_cid;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_vfe_axi_stream_request_cmd {
- uint32_t session_id;
- uint32_t stream_id;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t output_format;
- enum msm_vfe_axi_stream_src stream_src;
- struct msm_vfe_axi_plane_cfg plane_cfg[MAX_PLANES_PER_STREAM];
- uint32_t burst_count;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t hfr_mode;
- uint8_t frame_base;
- uint32_t init_frame_drop;
- enum msm_vfe_frame_skip_pattern frame_skip_pattern;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint8_t buf_divert;
- uint32_t axi_stream_handle;
-};
-struct msm_vfe_axi_stream_release_cmd {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t stream_handle;
-};
-enum msm_vfe_axi_stream_cmd {
- STOP_STREAM,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- START_STREAM,
-};
-struct msm_vfe_axi_stream_cfg_cmd {
- uint8_t num_streams;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t stream_handle[MAX_NUM_STREAM];
- enum msm_vfe_axi_stream_cmd cmd;
-};
-enum msm_vfe_axi_stream_update_type {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- ENABLE_STREAM_BUF_DIVERT,
- DISABLE_STREAM_BUF_DIVERT,
- UPDATE_STREAM_FRAMEDROP_PATTERN,
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_vfe_axi_stream_update_cmd {
- uint32_t stream_handle;
- enum msm_vfe_axi_stream_update_type update_type;
- enum msm_vfe_frame_skip_pattern skip_pattern;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-enum msm_vfe_stats_pipeline_policy {
- STATS_COMP_ALL,
- STATS_COMP_NONE,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MAX_STATS_POLICY,
-};
-enum msm_isp_stats_type {
- MSM_ISP_STATS_AEC,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MSM_ISP_STATS_AF,
- MSM_ISP_STATS_AWB,
- MSM_ISP_STATS_RS,
- MSM_ISP_STATS_CS,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MSM_ISP_STATS_IHIST,
- MSM_ISP_STATS_SKIN,
- MSM_ISP_STATS_BG,
- MSM_ISP_STATS_BF,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- MSM_ISP_STATS_BE,
- MSM_ISP_STATS_BHIST,
- MSM_ISP_STATS_MAX
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_vfe_stats_stream_request_cmd {
- uint32_t session_id;
- uint32_t stream_id;
- enum msm_isp_stats_type stats_type;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t framedrop_pattern;
- uint32_t irq_subsample_pattern;
- uint32_t stream_handle;
- uint8_t comp_flag;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_vfe_stats_stream_release_cmd {
- uint32_t stream_handle;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_vfe_stats_stream_cfg_cmd {
- uint8_t num_streams;
- uint32_t stream_handle[MSM_ISP_STATS_MAX];
- uint8_t enable;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_vfe_stats_comp_policy_cfg {
- enum msm_vfe_stats_pipeline_policy stats_pipeline_policy;
- uint32_t comp_framedrop_pattern;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t comp_irq_subsample_pattern;
-};
-enum msm_vfe_reg_cfg_type {
- VFE_WRITE,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- VFE_WRITE_MB,
- VFE_READ,
- VFE_CFG_MASK,
- VFE_WRITE_DMI_16BIT,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- VFE_WRITE_DMI_32BIT,
- VFE_WRITE_DMI_64BIT,
- VFE_READ_DMI_16BIT,
- VFE_READ_DMI_32BIT,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- VFE_READ_DMI_64BIT,
-};
-struct msm_vfe_cfg_cmd2 {
- uint16_t num_cfg;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint16_t cmd_len;
- void __user *cfg_data;
- void __user *cfg_cmd;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_vfe_reg_rw_info {
- uint32_t reg_offset;
- uint32_t cmd_data_offset;
- uint32_t len;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_vfe_reg_mask_info {
- uint32_t reg_offset;
- uint32_t mask;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t val;
-};
-struct msm_vfe_reg_dmi_info {
- uint32_t hi_tbl_offset;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t lo_tbl_offset;
- uint32_t len;
-};
-struct msm_vfe_reg_cfg_cmd {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- union {
- struct msm_vfe_reg_rw_info rw_info;
- struct msm_vfe_reg_mask_info mask_info;
- struct msm_vfe_reg_dmi_info dmi_info;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- } u;
- enum msm_vfe_reg_cfg_type cmd_type;
-};
-struct msm_isp_buf_request {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t session_id;
- uint32_t stream_id;
- uint8_t num_buf;
- uint32_t handle;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_isp_qbuf_info {
- uint32_t handle;
- int buf_idx;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct v4l2_buffer buffer;
- uint32_t dirty_buf;
-};
-struct msm_vfe_axi_src_state {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- enum msm_vfe_input_src input_src;
- uint32_t src_active;
-};
-enum msm_isp_event_idx {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- ISP_REG_UPDATE = 0,
- ISP_START_ACK = 1,
- ISP_STOP_ACK = 2,
- ISP_IRQ_VIOLATION = 3,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- ISP_WM_BUS_OVERFLOW = 4,
- ISP_STATS_OVERFLOW = 5,
- ISP_CAMIF_ERROR = 6,
- ISP_SOF = 7,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- ISP_EOF = 8,
- ISP_EVENT_MAX = 9
-};
-#define ISP_EVENT_OFFSET 8
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ISP_EVENT_BASE (V4L2_EVENT_PRIVATE_START)
-#define ISP_BUF_EVENT_BASE (ISP_EVENT_BASE + (1 << ISP_EVENT_OFFSET))
-#define ISP_STATS_EVENT_BASE (ISP_EVENT_BASE + (2 << ISP_EVENT_OFFSET))
-#define ISP_EVENT_REG_UPDATE (ISP_EVENT_BASE + ISP_REG_UPDATE)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ISP_EVENT_START_ACK (ISP_EVENT_BASE + ISP_START_ACK)
-#define ISP_EVENT_STOP_ACK (ISP_EVENT_BASE + ISP_STOP_ACK)
-#define ISP_EVENT_IRQ_VIOLATION (ISP_EVENT_BASE + ISP_IRQ_VIOLATION)
-#define ISP_EVENT_WM_BUS_OVERFLOW (ISP_EVENT_BASE + ISP_WM_BUS_OVERFLOW)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ISP_EVENT_STATS_OVERFLOW (ISP_EVENT_BASE + ISP_STATS_OVERFLOW)
-#define ISP_EVENT_CAMIF_ERROR (ISP_EVENT_BASE + ISP_CAMIF_ERROR)
-#define ISP_EVENT_SOF (ISP_EVENT_BASE + ISP_SOF)
-#define ISP_EVENT_EOF (ISP_EVENT_BASE + ISP_EOF)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ISP_EVENT_BUF_DIVERT (ISP_BUF_EVENT_BASE)
-#define ISP_EVENT_STATS_NOTIFY (ISP_STATS_EVENT_BASE)
-struct msm_isp_buf_event {
- uint32_t session_id;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t stream_id;
- uint32_t handle;
- int8_t buf_idx;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_isp_stats_event {
- uint32_t stats_mask;
- uint8_t stats_buf_idxs[MSM_ISP_STATS_MAX];
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_isp_stream_ack {
- uint32_t session_id;
- uint32_t stream_id;
- uint32_t handle;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_isp_event_data {
- struct timeval timestamp;
- uint32_t frame_id;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- union {
- struct msm_isp_stream_ack stream_ack;
- enum msm_vfe_input_src input_src;
- struct msm_isp_stats_event stats;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t irq_status_mask;
- struct msm_isp_buf_event buf_done;
- } u;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define V4L2_PIX_FMT_QBGGR8 v4l2_fourcc('Q', 'B', 'G', '8')
-#define V4L2_PIX_FMT_QGBRG8 v4l2_fourcc('Q', 'G', 'B', '8')
-#define V4L2_PIX_FMT_QGRBG8 v4l2_fourcc('Q', 'G', 'R', '8')
-#define V4L2_PIX_FMT_QRGGB8 v4l2_fourcc('Q', 'R', 'G', '8')
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define V4L2_PIX_FMT_QBGGR10 v4l2_fourcc('Q', 'B', 'G', '0')
-#define V4L2_PIX_FMT_QGBRG10 v4l2_fourcc('Q', 'G', 'B', '0')
-#define V4L2_PIX_FMT_QGRBG10 v4l2_fourcc('Q', 'G', 'R', '0')
-#define V4L2_PIX_FMT_QRGGB10 v4l2_fourcc('Q', 'R', 'G', '0')
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define V4L2_PIX_FMT_QBGGR12 v4l2_fourcc('Q', 'B', 'G', '2')
-#define V4L2_PIX_FMT_QGBRG12 v4l2_fourcc('Q', 'G', 'B', '2')
-#define V4L2_PIX_FMT_QGRBG12 v4l2_fourcc('Q', 'G', 'R', '2')
-#define V4L2_PIX_FMT_QRGGB12 v4l2_fourcc('Q', 'R', 'G', '2')
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define VIDIOC_MSM_VFE_REG_CFG   _IOWR('V', BASE_VIDIOC_PRIVATE, struct msm_vfe_cfg_cmd2)
-#define VIDIOC_MSM_ISP_REQUEST_BUF   _IOWR('V', BASE_VIDIOC_PRIVATE+1, struct msm_isp_buf_request)
-#define VIDIOC_MSM_ISP_ENQUEUE_BUF   _IOWR('V', BASE_VIDIOC_PRIVATE+2, struct msm_isp_qbuf_info)
-#define VIDIOC_MSM_ISP_RELEASE_BUF   _IOWR('V', BASE_VIDIOC_PRIVATE+3, struct msm_isp_buf_request)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define VIDIOC_MSM_ISP_REQUEST_STREAM   _IOWR('V', BASE_VIDIOC_PRIVATE+4, struct msm_vfe_axi_stream_request_cmd)
-#define VIDIOC_MSM_ISP_CFG_STREAM   _IOWR('V', BASE_VIDIOC_PRIVATE+5, struct msm_vfe_axi_stream_cfg_cmd)
-#define VIDIOC_MSM_ISP_RELEASE_STREAM   _IOWR('V', BASE_VIDIOC_PRIVATE+6, struct msm_vfe_axi_stream_release_cmd)
-#define VIDIOC_MSM_ISP_INPUT_CFG   _IOWR('V', BASE_VIDIOC_PRIVATE+7, struct msm_vfe_input_cfg)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define VIDIOC_MSM_ISP_SET_SRC_STATE   _IOWR('V', BASE_VIDIOC_PRIVATE+8, struct msm_vfe_axi_src_state)
-#define VIDIOC_MSM_ISP_REQUEST_STATS_STREAM   _IOWR('V', BASE_VIDIOC_PRIVATE+9,   struct msm_vfe_stats_stream_request_cmd)
-#define VIDIOC_MSM_ISP_CFG_STATS_STREAM   _IOWR('V', BASE_VIDIOC_PRIVATE+10, struct msm_vfe_stats_stream_cfg_cmd)
-#define VIDIOC_MSM_ISP_RELEASE_STATS_STREAM   _IOWR('V', BASE_VIDIOC_PRIVATE+11,   struct msm_vfe_stats_stream_release_cmd)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define VIDIOC_MSM_ISP_CFG_STATS_COMP_POLICY   _IOWR('V', BASE_VIDIOC_PRIVATE+12,   struct msm_vfe_stats_comp_policy_cfg)
-#define VIDIOC_MSM_ISP_UPDATE_STREAM   _IOWR('V', BASE_VIDIOC_PRIVATE+13, struct msm_vfe_axi_stream_update_cmd)
-#endif
-
diff --git a/kernel-headers/media/msmb_pproc.h b/kernel-headers/media/msmb_pproc.h
deleted file mode 100644
index 40ab806..0000000
--- a/kernel-headers/media/msmb_pproc.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __MSMB_PPROC_H
-#define __MSMB_PPROC_H
-#ifdef MSM_CAMERA_BIONIC
-#include <sys/types.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#endif
-#include <linux/videodev2.h>
-#include <linux/types.h>
-#define MAX_PLANES VIDEO_MAX_PLANES
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MAX_NUM_CPP_STRIPS 8
-enum msm_cpp_frame_type {
- MSM_CPP_OFFLINE_FRAME,
- MSM_CPP_REALTIME_FRAME,
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct msm_cpp_frame_strip_info {
- int scale_v_en;
- int scale_h_en;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int upscale_v_en;
- int upscale_h_en;
- int src_start_x;
- int src_end_x;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int src_start_y;
- int src_end_y;
- int pad_bottom;
- int pad_top;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int pad_right;
- int pad_left;
- int v_init_phase;
- int h_init_phase;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int h_phase_step;
- int v_phase_step;
- int prescale_crop_width_first_pixel;
- int prescale_crop_width_last_pixel;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int prescale_crop_height_first_line;
- int prescale_crop_height_last_line;
- int postscale_crop_height_first_line;
- int postscale_crop_height_last_line;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int postscale_crop_width_first_pixel;
- int postscale_crop_width_last_pixel;
- int dst_start_x;
- int dst_end_x;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int dst_start_y;
- int dst_end_y;
- int bytes_per_pixel;
- unsigned int source_address;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- unsigned int destination_address;
- unsigned int src_stride;
- unsigned int dst_stride;
- int rotate_270;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int horizontal_flip;
- int vertical_flip;
- int scale_output_width;
- int scale_output_height;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int prescale_crop_en;
- int postscale_crop_en;
-};
-struct msm_cpp_frame_info_t {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int32_t frame_id;
- uint32_t inst_id;
- uint32_t client_id;
- enum msm_cpp_frame_type frame_type;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- uint32_t num_strips;
- struct msm_cpp_frame_strip_info *strip_info;
- uint32_t msg_len;
- uint32_t *cpp_cmd_msg;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- int src_fd;
- int dst_fd;
- struct ion_handle *src_ion_handle;
- struct ion_handle *dest_ion_handle;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct cpp_hw_info {
- uint32_t cpp_hw_version;
- uint32_t cpp_hw_caps;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-#define VIDIOC_MSM_CPP_CFG   _IOWR('V', BASE_VIDIOC_PRIVATE, struct msm_camera_v4l2_ioctl_t)
-#define VIDIOC_MSM_CPP_GET_EVENTPAYLOAD   _IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct msm_camera_v4l2_ioctl_t)
-#define VIDIOC_MSM_CPP_GET_INST_INFO   _IOWR('V', BASE_VIDIOC_PRIVATE + 2, struct msm_camera_v4l2_ioctl_t)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define VIDIOC_MSM_CPP_LOAD_FIRMWARE   _IOWR('V', BASE_VIDIOC_PRIVATE + 3, struct msm_camera_v4l2_ioctl_t)
-#define VIDIOC_MSM_CPP_GET_HW_INFO   _IOWR('V', BASE_VIDIOC_PRIVATE + 4, struct msm_camera_v4l2_ioctl_t)
-#define VIDIOC_MSM_CPP_FLUSH_QUEUE   _IOWR('V', BASE_VIDIOC_PRIVATE + 5, struct msm_camera_v4l2_ioctl_t)
-#define V4L2_EVENT_CPP_FRAME_DONE (V4L2_EVENT_PRIVATE_START + 0)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct msm_camera_v4l2_ioctl_t {
- uint32_t id;
- uint32_t len;
- uint32_t trans_code;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- void __user *ioctl_ptr;
-};
-#endif
-
diff --git a/original-kernel-headers/media/msm_cam_sensor.h b/original-kernel-headers/media/msm_cam_sensor.h
deleted file mode 100755
index eb406d3..0000000
--- a/original-kernel-headers/media/msm_cam_sensor.h
+++ /dev/null
@@ -1,463 +0,0 @@
-#ifndef _UAPI_MEDIA_MSM_CAM_SENSOR_H
-#define _UAPI_MEDIA_MSM_CAM_SENSOR_H
-
-#ifdef MSM_CAMERA_BIONIC
-#include <sys/types.h>
-#endif
-#include <linux/types.h>
-#include <linux/v4l2-mediabus.h>
-#include <linux/i2c.h>
-
-#define I2C_SEQ_REG_SETTING_MAX   5
-#define I2C_SEQ_REG_DATA_MAX      20
-#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 MOVE_NEAR 0
-#define MOVE_FAR  1
-
-enum msm_camera_i2c_reg_addr_type {
-	MSM_CAMERA_I2C_BYTE_ADDR = 1,
-	MSM_CAMERA_I2C_WORD_ADDR,
-};
-
-enum msm_camera_i2c_data_type {
-	MSM_CAMERA_I2C_BYTE_DATA = 1,
-	MSM_CAMERA_I2C_WORD_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,
-};
-
-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_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,
-	MSM_SENSOR_RES_2,
-	MSM_SENSOR_RES_3,
-	MSM_SENSOR_RES_4,
-	MSM_SENSOR_RES_5,
-	MSM_SENSOR_RES_6,
-	MSM_SENSOR_RES_7,
-	MSM_SENSOR_INVALID_RES,
-};
-
-enum sensor_sub_module_t {
-	SUB_MODULE_SENSOR,
-	SUB_MODULE_CHROMATIX,
-	SUB_MODULE_ACTUATOR,
-	SUB_MODULE_EEPROM,
-	SUB_MODULE_LED_FLASH,
-	SUB_MODULE_STROBE_FLASH,
-	SUB_MODULE_CSIPHY,
-	SUB_MODULE_CSIPHY_3D,
-	SUB_MODULE_CSID,
-	SUB_MODULE_CSID_3D,
-	SUB_MODULE_MAX,
-};
-
-enum csid_cfg_type_t {
-	CSID_INIT,
-	CSID_CFG,
-	CSID_RELEASE,
-};
-
-enum csiphy_cfg_type_t {
-	CSIPHY_INIT,
-	CSIPHY_CFG,
-	CSIPHY_RELEASE,
-};
-
-enum camera_vreg_type {
-	REG_LDO,
-	REG_VS,
-	REG_GPIO,
-};
-
-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;
-	uint16_t size;
-};
-
-struct msm_sensor_id_info_t {
-	uint16_t sensor_id_reg_addr;
-	uint16_t sensor_id;
-};
-
-struct msm_camera_sensor_slave_info {
-	uint16_t slave_addr;
-	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;
-};
-
-struct msm_camera_i2c_reg_array {
-	uint16_t reg_addr;
-	uint16_t reg_data;
-};
-
-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_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[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;
-};
-
-struct msm_camera_csi2_params {
-	struct msm_camera_csid_params csid_params;
-	struct msm_camera_csiphy_params csiphy_params;
-};
-
-struct msm_camera_csi_lane_params {
-	uint16_t csi_lane_assign;
-	uint16_t csi_lane_mask;
-};
-
-struct csi_lane_params_t {
-	uint16_t csi_lane_assign;
-	uint8_t csi_lane_mask;
-	uint8_t csi_if;
-	uint8_t csid_core[2];
-	uint8_t csi_phy_sel;
-};
-
-struct msm_sensor_info_t {
-	char sensor_name[MAX_SENSOR_NAME];
-	int32_t    session_id;
-	int32_t     subdev_id[SUB_MODULE_MAX];
-};
-
-struct camera_vreg_t {
-	const char *reg_name;
-	enum camera_vreg_type type;
-	int min_voltage;
-	int max_voltage;
-	int op_mode;
-	uint32_t delay;
-};
-
-enum camb_position_t {
-	BACK_CAMERA_B,
-	FRONT_CAMERA_B,
-};
-
-enum camerab_mode_t {
-	CAMERA_MODE_2D_B = (1<<0),
-	CAMERA_MODE_3D_B = (1<<1)
-};
-
-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 sensorb_cfg_data {
-	int cfgtype;
-	union {
-		struct msm_sensor_info_t      sensor_info;
-		struct msm_sensor_init_params sensor_init_params;
-		void                         *setting;
-	} cfg;
-};
-
-struct csid_cfg_data {
-	enum csid_cfg_type_t cfgtype;
-	union {
-		uint32_t csid_version;
-		struct msm_camera_csid_params *csid_params;
-	} cfg;
-};
-
-struct csiphy_cfg_data {
-	enum csiphy_cfg_type_t cfgtype;
-	union {
-		struct msm_camera_csiphy_params *csiphy_params;
-		struct msm_camera_csi_lane_params *csi_lane_params;
-	} cfg;
-};
-
-enum msm_sensor_cfg_type_t {
-	CFG_SET_SLAVE_INFO,
-	CFG_WRITE_I2C_ARRAY,
-	CFG_WRITE_I2C_SEQ_ARRAY,
-	CFG_POWER_UP,
-	CFG_POWER_DOWN,
-	CFG_SET_STOP_STREAM_SETTING,
-	CFG_GET_SENSOR_INFO,
-	CFG_GET_SENSOR_INIT_PARAMS,
-	CFG_SET_INIT_SETTING,
-	CFG_SET_RESOLUTION,
-	CFG_SET_STOP_STREAM,
-	CFG_SET_START_STREAM,
-};
-
-enum msm_actuator_cfg_type_t {
-	CFG_GET_ACTUATOR_INFO,
-	CFG_SET_ACTUATOR_INFO,
-	CFG_SET_DEFAULT_FOCUS,
-	CFG_MOVE_FOCUS,
-};
-
-enum actuator_type {
-	ACTUATOR_VCM,
-	ACTUATOR_PIEZO,
-};
-
-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,
-};
-
-struct reg_settings_t {
-	uint16_t reg_addr;
-	uint16_t reg_data;
-};
-
-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;
-	int16_t dest_step_pos;
-	int32_t num_steps;
-	struct damping_params_t *ringing_params;
-};
-
-struct msm_actuator_tuning_params_t {
-	int16_t initial_code;
-	uint16_t pwd_step;
-	uint16_t region_size;
-	uint32_t total_steps;
-	struct region_params_t *region_params;
-};
-
-struct msm_actuator_params_t {
-	enum actuator_type act_type;
-	uint8_t reg_tbl_size;
-	uint16_t data_size;
-	uint16_t init_setting_size;
-	uint32_t i2c_addr;
-	enum msm_actuator_addr_type i2c_addr_type;
-	enum msm_actuator_data_type i2c_data_type;
-	struct msm_actuator_reg_params_t *reg_tbl_params;
-	struct reg_settings_t *init_settings;
-};
-
-struct msm_actuator_set_info_t {
-	struct msm_actuator_params_t actuator_params;
-	struct msm_actuator_tuning_params_t af_tuning_params;
-};
-
-struct msm_actuator_get_info_t {
-	uint32_t focal_length_num;
-	uint32_t focal_length_den;
-	uint32_t f_number_num;
-	uint32_t f_number_den;
-	uint32_t f_pix_num;
-	uint32_t f_pix_den;
-	uint32_t total_f_dist_num;
-	uint32_t total_f_dist_den;
-	uint32_t hor_view_angle_num;
-	uint32_t hor_view_angle_den;
-	uint32_t ver_view_angle_num;
-	uint32_t ver_view_angle_den;
-};
-
-enum af_camera_name {
-	ACTUATOR_MAIN_CAM_0,
-	ACTUATOR_MAIN_CAM_1,
-	ACTUATOR_MAIN_CAM_2,
-	ACTUATOR_MAIN_CAM_3,
-	ACTUATOR_MAIN_CAM_4,
-	ACTUATOR_MAIN_CAM_5,
-	ACTUATOR_WEB_CAM_0,
-	ACTUATOR_WEB_CAM_1,
-	ACTUATOR_WEB_CAM_2,
-};
-
-struct msm_actuator_cfg_data {
-	int cfgtype;
-	uint8_t is_af_supported;
-	union {
-		struct msm_actuator_move_params_t move;
-		struct msm_actuator_set_info_t set_info;
-		struct msm_actuator_get_info_t get_info;
-		enum af_camera_name cam_name;
-	} 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,
-	MSM_CAMERA_LED_HIGH,
-	MSM_CAMERA_LED_INIT,
-	MSM_CAMERA_LED_RELEASE,
-};
-
-struct msm_camera_led_cfg_t {
-	enum msm_camera_led_config_t cfgtype;
-};
-
-#define VIDIOC_MSM_SENSOR_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct sensorb_cfg_data)
-
-#define VIDIOC_MSM_SENSOR_RELEASE \
-	_IO('V', BASE_VIDIOC_PRIVATE + 2)
-
-#define VIDIOC_MSM_SENSOR_GET_SUBDEV_ID \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 3, uint32_t)
-
-#define VIDIOC_MSM_CSIPHY_IO_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 4, struct csid_cfg_data)
-
-#define VIDIOC_MSM_CSID_IO_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 5, struct csiphy_cfg_data)
-
-#define VIDIOC_MSM_ACTUATOR_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 6, struct msm_actuator_cfg_data)
-
-#define VIDIOC_MSM_FLASH_LED_DATA_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 7, struct msm_camera_led_cfg_t)
-
-#define MSM_V4L2_PIX_FMT_META v4l2_fourcc('M', 'E', 'T', 'A') /* META */
-
-#define MSM_V4L2_PIX_FMT_RESERVED_0 v4l2_fourcc('R', 'E', 'S', '0')
-
-#endif /* __LINUX_MSM_CAM_SENSOR_H */
diff --git a/original-kernel-headers/media/msmb_camera.h b/original-kernel-headers/media/msmb_camera.h
deleted file mode 100644
index 123c86c..0000000
--- a/original-kernel-headers/media/msmb_camera.h
+++ /dev/null
@@ -1,160 +0,0 @@
-#ifndef __LINUX_MSMB_CAMERA_H
-#define __LINUX_MSMB_CAMERA_H
-
-#include <linux/videodev2.h>
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-#define MSM_CAM_V4L2_IOCTL_NOTIFY \
-	_IOW('V', BASE_VIDIOC_PRIVATE + 30, struct v4l2_event)
-
-#define MSM_CAM_V4L2_IOCTL_NOTIFY_META \
-	_IOW('V', BASE_VIDIOC_PRIVATE + 31, struct v4l2_event)
-
-#define MSM_CAM_V4L2_IOCTL_CMD_ACK \
-	_IOW('V', BASE_VIDIOC_PRIVATE + 32, struct v4l2_event)
-
-#define QCAMERA_DEVICE_GROUP_ID	1
-#define QCAMERA_VNODE_GROUP_ID	2
-#define MSM_CAMERA_NAME					"msm_camera"
-#define MSM_CONFIGURATION_NAME	"msm_config"
-
-#define MSM_CAMERA_SUBDEV_CSIPHY       0
-#define MSM_CAMERA_SUBDEV_CSID         1
-#define MSM_CAMERA_SUBDEV_ISPIF        2
-#define MSM_CAMERA_SUBDEV_VFE          3
-#define MSM_CAMERA_SUBDEV_AXI          4
-#define MSM_CAMERA_SUBDEV_VPE          5
-#define MSM_CAMERA_SUBDEV_SENSOR       6
-#define MSM_CAMERA_SUBDEV_ACTUATOR     7
-#define MSM_CAMERA_SUBDEV_EEPROM       8
-#define MSM_CAMERA_SUBDEV_CPP          9
-#define MSM_CAMERA_SUBDEV_CCI          10
-#define MSM_CAMERA_SUBDEV_LED_FLASH    11
-#define MSM_CAMERA_SUBDEV_STROBE_FLASH 12
-#define MSM_CAMERA_SUBDEV_BUF_MNGR     13
-
-#define MSM_MAX_CAMERA_SENSORS  5
-
-/* featur base */
-#define MSM_CAMERA_FEATURE_BASE     0x00010000
-#define MSM_CAMERA_FEATURE_SHUTDOWN (MSM_CAMERA_FEATURE_BASE + 1)
-
-#define MSM_CAMERA_STATUS_BASE      0x00020000
-#define MSM_CAMERA_STATUS_FAIL      (MSM_CAMERA_STATUS_BASE + 1)
-#define MSM_CAMERA_STATUS_SUCCESS   (MSM_CAMERA_STATUS_BASE + 2)
-
-/* event type */
-#define MSM_CAMERA_V4L2_EVENT_TYPE (V4L2_EVENT_PRIVATE_START + 0x00002000)
-
-/* event id */
-#define MSM_CAMERA_EVENT_MIN    0
-#define MSM_CAMERA_NEW_SESSION  (MSM_CAMERA_EVENT_MIN + 1)
-#define MSM_CAMERA_DEL_SESSION  (MSM_CAMERA_EVENT_MIN + 2)
-#define MSM_CAMERA_SET_PARM     (MSM_CAMERA_EVENT_MIN + 3)
-#define MSM_CAMERA_GET_PARM     (MSM_CAMERA_EVENT_MIN + 4)
-#define MSM_CAMERA_MAPPING_CFG  (MSM_CAMERA_EVENT_MIN + 5)
-#define MSM_CAMERA_MAPPING_SES  (MSM_CAMERA_EVENT_MIN + 6)
-#define MSM_CAMERA_MSM_NOTIFY   (MSM_CAMERA_EVENT_MIN + 7)
-#define MSM_CAMERA_EVENT_MAX    (MSM_CAMERA_EVENT_MIN + 8)
-
-/* data.command */
-#define MSM_CAMERA_PRIV_S_CROP		 (V4L2_CID_PRIVATE_BASE + 1)
-#define MSM_CAMERA_PRIV_G_CROP		 (V4L2_CID_PRIVATE_BASE + 2)
-#define MSM_CAMERA_PRIV_G_FMT			 (V4L2_CID_PRIVATE_BASE + 3)
-#define MSM_CAMERA_PRIV_S_FMT			 (V4L2_CID_PRIVATE_BASE + 4)
-#define MSM_CAMERA_PRIV_TRY_FMT		 (V4L2_CID_PRIVATE_BASE + 5)
-#define MSM_CAMERA_PRIV_METADATA	 (V4L2_CID_PRIVATE_BASE + 6)
-#define MSM_CAMERA_PRIV_QUERY_CAP  (V4L2_CID_PRIVATE_BASE + 7)
-#define MSM_CAMERA_PRIV_STREAM_ON  (V4L2_CID_PRIVATE_BASE + 8)
-#define MSM_CAMERA_PRIV_STREAM_OFF (V4L2_CID_PRIVATE_BASE + 9)
-#define MSM_CAMERA_PRIV_NEW_STREAM (V4L2_CID_PRIVATE_BASE + 10)
-#define MSM_CAMERA_PRIV_DEL_STREAM (V4L2_CID_PRIVATE_BASE + 11)
-#define MSM_CAMERA_PRIV_SHUTDOWN   (V4L2_CID_PRIVATE_BASE + 12)
-#define MSM_CAMERA_PRIV_STREAM_INFO_SYNC \
-	(V4L2_CID_PRIVATE_BASE + 13)
-
-/* data.status - success */
-#define MSM_CAMERA_CMD_SUCESS      0x00000001
-#define MSM_CAMERA_BUF_MAP_SUCESS  0x00000002
-
-/* data.status - error */
-#define MSM_CAMERA_ERR_EVT_BASE 0x00010000
-#define MSM_CAMERA_ERR_CMD_FAIL (MSM_CAMERA_ERR_EVT_BASE + 1)
-#define MSM_CAMERA_ERR_MAPPING  (MSM_CAMERA_ERR_EVT_BASE + 2)
-
-/* The msm_v4l2_event_data structure should match the
- * v4l2_event.u.data field.
- * should not exceed 16 elements */
-struct msm_v4l2_event_data {
-	/*word 0*/
-	unsigned int command;
-	/*word 1*/
-	unsigned int status;
-	/*word 2*/
-	unsigned int session_id;
-	/*word 3*/
-	unsigned int stream_id;
-	/*word 4*/
-	unsigned int map_op;
-	/*word 5*/
-	unsigned int map_buf_idx;
-	/*word 6*/
-	unsigned int notify;
-	/*word 7*/
-	unsigned int nop1;
-	/*word 8*/
-	unsigned int nop2;
-	/*word 9*/
-	unsigned int nop3;
-	/*word 10*/
-	unsigned int nop4;
-	/*word 11*/
-	unsigned int nop5;
-	/*word 12*/
-	unsigned int nop6;
-	/*word 13*/
-	unsigned int nop7;
-	/*word 14*/
-	unsigned int nop8;
-	/*word 15*/
-	unsigned int nop9;
-};
-
-/* map to v4l2_format.fmt.raw_data */
-struct msm_v4l2_format_data {
-	enum v4l2_buf_type type;
-	unsigned int width;
-	unsigned int height;
-	unsigned int pixelformat; /* FOURCC */
-	unsigned char num_planes;
-	unsigned int plane_sizes[VIDEO_MAX_PLANES];
-};
-
-/*  MSM Four-character-code (FOURCC) */
-#define msm_v4l2_fourcc(a, b, c, d)\
-	((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) |\
-	((__u32)(d) << 24))
-
-/* Composite stats */
-#define MSM_V4L2_PIX_FMT_STATS_COMB v4l2_fourcc('S', 'T', 'C', 'M')
-/* AEC stats */
-#define MSM_V4L2_PIX_FMT_STATS_AE   v4l2_fourcc('S', 'T', 'A', 'E')
-/* AF stats */
-#define MSM_V4L2_PIX_FMT_STATS_AF   v4l2_fourcc('S', 'T', 'A', 'F')
-/* AWB stats */
-#define MSM_V4L2_PIX_FMT_STATS_AWB  v4l2_fourcc('S', 'T', 'W', 'B')
-/* IHIST stats */
-#define MSM_V4L2_PIX_FMT_STATS_IHST v4l2_fourcc('I', 'H', 'S', 'T')
-/* Column count stats */
-#define MSM_V4L2_PIX_FMT_STATS_CS   v4l2_fourcc('S', 'T', 'C', 'S')
-/* Row count stats */
-#define MSM_V4L2_PIX_FMT_STATS_RS   v4l2_fourcc('S', 'T', 'R', 'S')
-/* Bayer Grid stats */
-#define MSM_V4L2_PIX_FMT_STATS_BG   v4l2_fourcc('S', 'T', 'B', 'G')
-/* Bayer focus stats */
-#define MSM_V4L2_PIX_FMT_STATS_BF   v4l2_fourcc('S', 'T', 'B', 'F')
-/* Bayer hist stats */
-#define MSM_V4L2_PIX_FMT_STATS_BHST v4l2_fourcc('B', 'H', 'S', 'T')
-
-#endif /* __LINUX_MSMB_CAMERA_H */
diff --git a/original-kernel-headers/media/msmb_generic_buf_mgr.h b/original-kernel-headers/media/msmb_generic_buf_mgr.h
deleted file mode 100644
index bd313bc..0000000
--- a/original-kernel-headers/media/msmb_generic_buf_mgr.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __MEDIA_MSMB_BUF_MNGR_H__
-#define __MEDIA_MSMB_BUF_MNGR_H__
-
-struct msm_buf_mngr_info {
-	uint32_t session_id;
-	uint32_t stream_id;
-	uint32_t frame_id;
-	struct timeval timestamp;
-	uint32_t index;
-};
-
-#define VIDIOC_MSM_BUF_MNGR_GET_BUF \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 33, struct msm_buf_mngr_info)
-
-#define VIDIOC_MSM_BUF_MNGR_PUT_BUF \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 34, struct msm_buf_mngr_info)
-
-#define VIDIOC_MSM_BUF_MNGR_BUF_DONE \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 35, struct msm_buf_mngr_info)
-
-#endif
diff --git a/original-kernel-headers/media/msmb_isp.h b/original-kernel-headers/media/msmb_isp.h
deleted file mode 100644
index eae35de..0000000
--- a/original-kernel-headers/media/msmb_isp.h
+++ /dev/null
@@ -1,411 +0,0 @@
-#ifndef _UAPI_MEDIA_MSMB_ISP_H
-#define _UAPI_MEDIA_MSMB_ISP_H
-
-#include <linux/videodev2.h>
-
-#define MAX_PLANES_PER_STREAM 3
-#define MAX_NUM_STREAM 7
-
-#define ISP_VERSION_40        40
-#define ISP_VERSION_32        32
-#define ISP_NATIVE_BUF_BIT    0x10000
-#define ISP_STATS_STREAM_BIT  0x80000000
-
-enum ISP_START_PIXEL_PATTERN {
-	ISP_BAYER_RGRGRG,
-	ISP_BAYER_GRGRGR,
-	ISP_BAYER_BGBGBG,
-	ISP_BAYER_GBGBGB,
-	ISP_YUV_YCbYCr,
-	ISP_YUV_YCrYCb,
-	ISP_YUV_CbYCrY,
-	ISP_YUV_CrYCbY,
-	ISP_PIX_PATTERN_MAX
-};
-
-enum msm_vfe_plane_fmt {
-	Y_PLANE,
-	CB_PLANE,
-	CR_PLANE,
-	CRCB_PLANE,
-	CBCR_PLANE,
-	VFE_PLANE_FMT_MAX
-};
-
-enum msm_vfe_input_src {
-	VFE_PIX_0,
-	VFE_RAW_0,
-	VFE_RAW_1,
-	VFE_RAW_2,
-	VFE_SRC_MAX,
-};
-
-enum msm_vfe_axi_stream_src {
-	PIX_ENCODER,
-	PIX_VIEWFINDER,
-	CAMIF_RAW,
-	IDEAL_RAW,
-	RDI_INTF_0,
-	RDI_INTF_1,
-	RDI_INTF_2,
-	VFE_AXI_SRC_MAX
-};
-
-enum msm_vfe_frame_skip_pattern {
-	NO_SKIP,
-	EVERY_2FRAME,
-	EVERY_3FRAME,
-	EVERY_4FRAME,
-	EVERY_5FRAME,
-	EVERY_6FRAME,
-	EVERY_7FRAME,
-	EVERY_8FRAME,
-	EVERY_16FRAME,
-	EVERY_32FRAME,
-	MAX_SKIP,
-};
-
-enum msm_vfe_camif_input {
-	CAMIF_DISABLED,
-	CAMIF_PAD_REG_INPUT,
-	CAMIF_MIDDI_INPUT,
-	CAMIF_MIPI_INPUT,
-};
-
-struct msm_vfe_camif_cfg {
-	uint32_t lines_per_frame;
-	uint32_t pixels_per_line;
-	uint32_t first_pixel;
-	uint32_t last_pixel;
-	uint32_t first_line;
-	uint32_t last_line;
-	uint32_t epoch_line0;
-	uint32_t epoch_line1;
-	enum msm_vfe_camif_input camif_input;
-};
-
-enum msm_vfe_inputmux {
-	CAMIF,
-	TESTGEN,
-	EXTERNAL_READ,
-};
-
-struct msm_vfe_pix_cfg {
-	struct msm_vfe_camif_cfg camif_cfg;
-	enum msm_vfe_inputmux input_mux;
-	enum ISP_START_PIXEL_PATTERN pixel_pattern;
-};
-
-struct msm_vfe_rdi_cfg {
-	uint8_t cid;
-	uint8_t frame_based;
-};
-
-struct msm_vfe_input_cfg {
-	union {
-		struct msm_vfe_pix_cfg pix_cfg;
-		struct msm_vfe_rdi_cfg rdi_cfg;
-	} d;
-	enum msm_vfe_input_src input_src;
-};
-
-struct msm_vfe_axi_plane_cfg {
-	uint32_t output_width; /*Include padding*/
-	uint32_t output_height;
-	uint32_t output_stride;
-	uint32_t output_scan_lines;
-	uint32_t output_plane_format; /*Y/Cb/Cr/CbCr*/
-
-	uint8_t csid_src; /*RDI 0-2*/
-	uint8_t rdi_cid;/*CID 1-16*/
-};
-
-struct msm_vfe_axi_stream_request_cmd {
-	uint32_t session_id;
-	uint32_t stream_id;
-	uint32_t output_format;/*Planar/RAW/Misc*/
-	enum msm_vfe_axi_stream_src stream_src; /*CAMIF/IDEAL/RDIs*/
-	struct msm_vfe_axi_plane_cfg plane_cfg[MAX_PLANES_PER_STREAM];
-
-	uint32_t burst_count;
-	uint32_t hfr_mode;
-	uint8_t frame_base;
-
-	uint32_t init_frame_drop; /*MAX 31 Frames*/
-	enum msm_vfe_frame_skip_pattern frame_skip_pattern;
-	uint8_t buf_divert; /* if TRUE no vb2 buf done. */
-	/*Return values*/
-	uint32_t axi_stream_handle;
-};
-
-struct msm_vfe_axi_stream_release_cmd {
-	uint32_t stream_handle;
-};
-
-enum msm_vfe_axi_stream_cmd {
-	STOP_STREAM,
-	START_STREAM,
-};
-
-struct msm_vfe_axi_stream_cfg_cmd {
-	uint8_t num_streams;
-	uint32_t stream_handle[MAX_NUM_STREAM];
-	enum msm_vfe_axi_stream_cmd cmd;
-};
-
-enum msm_vfe_axi_stream_update_type {
-	ENABLE_STREAM_BUF_DIVERT,
-	DISABLE_STREAM_BUF_DIVERT,
-	UPDATE_STREAM_FRAMEDROP_PATTERN,
-};
-
-struct msm_vfe_axi_stream_update_cmd {
-	uint32_t stream_handle;
-	enum msm_vfe_axi_stream_update_type update_type;
-	enum msm_vfe_frame_skip_pattern skip_pattern;
-};
-
-enum msm_vfe_stats_pipeline_policy {
-	STATS_COMP_ALL,
-	STATS_COMP_NONE,
-	MAX_STATS_POLICY,
-};
-
-enum msm_isp_stats_type {
-	MSM_ISP_STATS_AEC,   /* legacy based AEC */
-	MSM_ISP_STATS_AF,    /* legacy based AF */
-	MSM_ISP_STATS_AWB,   /* legacy based AWB */
-	MSM_ISP_STATS_RS,    /* legacy based RS */
-	MSM_ISP_STATS_CS,    /* legacy based CS */
-	MSM_ISP_STATS_IHIST, /* legacy based HIST */
-	MSM_ISP_STATS_SKIN,  /* legacy based SKIN */
-	MSM_ISP_STATS_BG,    /* Bayer Grids */
-	MSM_ISP_STATS_BF,    /* Bayer Focus */
-	MSM_ISP_STATS_BE,    /* Bayer Exposure*/
-	MSM_ISP_STATS_BHIST, /* Bayer Hist */
-	MSM_ISP_STATS_MAX    /* MAX */
-};
-
-struct msm_vfe_stats_stream_request_cmd {
-	uint32_t session_id;
-	uint32_t stream_id;
-	enum msm_isp_stats_type stats_type;
-	uint32_t framedrop_pattern;
-	uint32_t irq_subsample_pattern;
-	uint32_t stream_handle;
-	uint8_t comp_flag;
-};
-
-struct msm_vfe_stats_stream_release_cmd {
-	uint32_t stream_handle;
-};
-
-struct msm_vfe_stats_stream_cfg_cmd {
-	uint8_t num_streams;
-	uint32_t stream_handle[MSM_ISP_STATS_MAX];
-	uint8_t enable;
-};
-
-struct msm_vfe_stats_comp_policy_cfg {
-	enum msm_vfe_stats_pipeline_policy stats_pipeline_policy;
-	uint32_t comp_framedrop_pattern;
-	uint32_t comp_irq_subsample_pattern;
-};
-
-enum msm_vfe_reg_cfg_type {
-	VFE_WRITE,
-	VFE_WRITE_MB,
-	VFE_READ,
-	VFE_CFG_MASK,
-	VFE_WRITE_DMI_16BIT,
-	VFE_WRITE_DMI_32BIT,
-	VFE_WRITE_DMI_64BIT,
-	VFE_READ_DMI_16BIT,
-	VFE_READ_DMI_32BIT,
-	VFE_READ_DMI_64BIT,
-};
-
-struct msm_vfe_cfg_cmd2 {
-	uint16_t num_cfg;
-	uint16_t cmd_len;
-	void __user *cfg_data;
-	void __user *cfg_cmd;
-};
-
-struct msm_vfe_reg_rw_info {
-	uint32_t reg_offset;
-	uint32_t cmd_data_offset;
-	uint32_t len;
-};
-
-struct msm_vfe_reg_mask_info {
-	uint32_t reg_offset;
-	uint32_t mask;
-	uint32_t val;
-};
-
-struct msm_vfe_reg_dmi_info {
-	uint32_t hi_tbl_offset; /*Optional*/
-	uint32_t lo_tbl_offset; /*Required*/
-	uint32_t len;
-};
-
-struct msm_vfe_reg_cfg_cmd {
-	union {
-		struct msm_vfe_reg_rw_info rw_info;
-		struct msm_vfe_reg_mask_info mask_info;
-	struct msm_vfe_reg_dmi_info dmi_info;
-	} u;
-	enum msm_vfe_reg_cfg_type cmd_type;
-};
-
-struct msm_isp_buf_request {
-	uint32_t session_id;
-	uint32_t stream_id;
-	uint8_t num_buf;
-	uint32_t handle;
-};
-
-struct msm_isp_qbuf_info {
-	uint32_t handle;
-	int buf_idx;
-	/*Only used for prepare buffer*/
-	struct v4l2_buffer buffer;
-	/*Only used for diverted buffer*/
-	uint32_t dirty_buf;
-};
-
-struct msm_vfe_axi_src_state {
-	enum msm_vfe_input_src input_src;
-	uint32_t src_active;
-};
-
-enum msm_isp_event_idx {
-	ISP_REG_UPDATE      = 0,
-	ISP_START_ACK       = 1,
-	ISP_STOP_ACK        = 2,
-	ISP_IRQ_VIOLATION   = 3,
-	ISP_WM_BUS_OVERFLOW = 4,
-	ISP_STATS_OVERFLOW  = 5,
-	ISP_CAMIF_ERROR     = 6,
-	ISP_SOF             = 7,
-	ISP_EOF             = 8,
-	ISP_EVENT_MAX       = 9
-};
-
-#define ISP_EVENT_OFFSET          8
-#define ISP_EVENT_BASE            (V4L2_EVENT_PRIVATE_START)
-#define ISP_BUF_EVENT_BASE        (ISP_EVENT_BASE + (1 << ISP_EVENT_OFFSET))
-#define ISP_STATS_EVENT_BASE      (ISP_EVENT_BASE + (2 << ISP_EVENT_OFFSET))
-#define ISP_EVENT_REG_UPDATE      (ISP_EVENT_BASE + ISP_REG_UPDATE)
-#define ISP_EVENT_START_ACK       (ISP_EVENT_BASE + ISP_START_ACK)
-#define ISP_EVENT_STOP_ACK        (ISP_EVENT_BASE + ISP_STOP_ACK)
-#define ISP_EVENT_IRQ_VIOLATION   (ISP_EVENT_BASE + ISP_IRQ_VIOLATION)
-#define ISP_EVENT_WM_BUS_OVERFLOW (ISP_EVENT_BASE + ISP_WM_BUS_OVERFLOW)
-#define ISP_EVENT_STATS_OVERFLOW  (ISP_EVENT_BASE + ISP_STATS_OVERFLOW)
-#define ISP_EVENT_CAMIF_ERROR     (ISP_EVENT_BASE + ISP_CAMIF_ERROR)
-#define ISP_EVENT_SOF             (ISP_EVENT_BASE + ISP_SOF)
-#define ISP_EVENT_EOF             (ISP_EVENT_BASE + ISP_EOF)
-#define ISP_EVENT_BUF_DIVERT      (ISP_BUF_EVENT_BASE)
-#define ISP_EVENT_STATS_NOTIFY    (ISP_STATS_EVENT_BASE)
-
-/* The msm_v4l2_event_data structure should match the
- * v4l2_event.u.data field.
- * should not exceed 64 bytes */
-
-struct msm_isp_buf_event {
-	uint32_t session_id;
-	uint32_t stream_id;
-	uint32_t handle;
-	int8_t buf_idx;
-};
-struct msm_isp_stats_event {
-	uint32_t stats_mask;                        /* 4 bytes */
-	uint8_t stats_buf_idxs[MSM_ISP_STATS_MAX];  /* 11 bytes */
-};
-
-struct msm_isp_stream_ack {
-	uint32_t session_id;
-	uint32_t stream_id;
-	uint32_t handle;
-};
-
-struct msm_isp_event_data {
-	/*Wall clock except for buffer divert events
-	 *which use monotonic clock
-	 */
-	struct timeval timestamp;
-	/* if pix is a src frame_id is from camif */
-	uint32_t frame_id;
-	union {
-		/* START_ACK, STOP_ACK */
-		struct msm_isp_stream_ack stream_ack;
-		/* REG_UPDATE_TRIGGER, bus over flow */
-		enum msm_vfe_input_src input_src;
-		/* stats notify */
-		struct msm_isp_stats_event stats;
-		/* IRQ_VIOLATION, STATS_OVER_FLOW, WM_OVER_FLOW */
-		uint32_t irq_status_mask;
-		struct msm_isp_buf_event buf_done;
-	} u; /* union can have max 52 bytes */
-};
-
-#define V4L2_PIX_FMT_QBGGR8  v4l2_fourcc('Q', 'B', 'G', '8')
-#define V4L2_PIX_FMT_QGBRG8  v4l2_fourcc('Q', 'G', 'B', '8')
-#define V4L2_PIX_FMT_QGRBG8  v4l2_fourcc('Q', 'G', 'R', '8')
-#define V4L2_PIX_FMT_QRGGB8  v4l2_fourcc('Q', 'R', 'G', '8')
-#define V4L2_PIX_FMT_QBGGR10 v4l2_fourcc('Q', 'B', 'G', '0')
-#define V4L2_PIX_FMT_QGBRG10 v4l2_fourcc('Q', 'G', 'B', '0')
-#define V4L2_PIX_FMT_QGRBG10 v4l2_fourcc('Q', 'G', 'R', '0')
-#define V4L2_PIX_FMT_QRGGB10 v4l2_fourcc('Q', 'R', 'G', '0')
-#define V4L2_PIX_FMT_QBGGR12 v4l2_fourcc('Q', 'B', 'G', '2')
-#define V4L2_PIX_FMT_QGBRG12 v4l2_fourcc('Q', 'G', 'B', '2')
-#define V4L2_PIX_FMT_QGRBG12 v4l2_fourcc('Q', 'G', 'R', '2')
-#define V4L2_PIX_FMT_QRGGB12 v4l2_fourcc('Q', 'R', 'G', '2')
-
-#define VIDIOC_MSM_VFE_REG_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE, struct msm_vfe_cfg_cmd2)
-
-#define VIDIOC_MSM_ISP_REQUEST_BUF \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+1, struct msm_isp_buf_request)
-
-#define VIDIOC_MSM_ISP_ENQUEUE_BUF \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+2, struct msm_isp_qbuf_info)
-
-#define VIDIOC_MSM_ISP_RELEASE_BUF \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+3, struct msm_isp_buf_request)
-
-#define VIDIOC_MSM_ISP_REQUEST_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+4, struct msm_vfe_axi_stream_request_cmd)
-
-#define VIDIOC_MSM_ISP_CFG_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+5, struct msm_vfe_axi_stream_cfg_cmd)
-
-#define VIDIOC_MSM_ISP_RELEASE_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+6, struct msm_vfe_axi_stream_release_cmd)
-
-#define VIDIOC_MSM_ISP_INPUT_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+7, struct msm_vfe_input_cfg)
-
-#define VIDIOC_MSM_ISP_SET_SRC_STATE \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+8, struct msm_vfe_axi_src_state)
-
-#define VIDIOC_MSM_ISP_REQUEST_STATS_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+9, \
-	struct msm_vfe_stats_stream_request_cmd)
-
-#define VIDIOC_MSM_ISP_CFG_STATS_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+10, struct msm_vfe_stats_stream_cfg_cmd)
-
-#define VIDIOC_MSM_ISP_RELEASE_STATS_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+11, \
-	struct msm_vfe_stats_stream_release_cmd)
-
-#define VIDIOC_MSM_ISP_CFG_STATS_COMP_POLICY \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+12, \
-	struct msm_vfe_stats_comp_policy_cfg)
-
-#define VIDIOC_MSM_ISP_UPDATE_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+13, struct msm_vfe_axi_stream_update_cmd)
-
-#endif /* _UAPI_MEDIA_MSMB_ISP_H */
diff --git a/original-kernel-headers/media/msmb_pproc.h b/original-kernel-headers/media/msmb_pproc.h
deleted file mode 100644
index 6f8e865..0000000
--- a/original-kernel-headers/media/msmb_pproc.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef __MSMB_PPROC_H
-#define __MSMB_PPROC_H
-
-#ifdef MSM_CAMERA_BIONIC
-#include <sys/types.h>
-#endif
-#include <linux/videodev2.h>
-#include <linux/types.h>
-
-/* Should be same as VIDEO_MAX_PLANES in videodev2.h */
-#define MAX_PLANES VIDEO_MAX_PLANES
-
-#define MAX_NUM_CPP_STRIPS 8
-
-enum msm_cpp_frame_type {
-	MSM_CPP_OFFLINE_FRAME,
-	MSM_CPP_REALTIME_FRAME,
-};
-
-struct msm_cpp_frame_strip_info {
-	int scale_v_en;
-	int scale_h_en;
-
-	int upscale_v_en;
-	int upscale_h_en;
-
-	int src_start_x;
-	int src_end_x;
-	int src_start_y;
-	int src_end_y;
-
-	/* Padding is required for upscaler because it does not
-	 * pad internally like other blocks, also needed for rotation
-	 * rotation expects all the blocks in the stripe to be the same size
-	 * Padding is done such that all the extra padded pixels
-	 * are on the right and bottom
-	 */
-	int pad_bottom;
-	int pad_top;
-	int pad_right;
-	int pad_left;
-
-	int v_init_phase;
-	int h_init_phase;
-	int h_phase_step;
-	int v_phase_step;
-
-	int prescale_crop_width_first_pixel;
-	int prescale_crop_width_last_pixel;
-	int prescale_crop_height_first_line;
-	int prescale_crop_height_last_line;
-
-	int postscale_crop_height_first_line;
-	int postscale_crop_height_last_line;
-	int postscale_crop_width_first_pixel;
-	int postscale_crop_width_last_pixel;
-
-	int dst_start_x;
-	int dst_end_x;
-	int dst_start_y;
-	int dst_end_y;
-
-	int bytes_per_pixel;
-	unsigned int source_address;
-	unsigned int destination_address;
-	unsigned int src_stride;
-	unsigned int dst_stride;
-	int rotate_270;
-	int horizontal_flip;
-	int vertical_flip;
-	int scale_output_width;
-	int scale_output_height;
-	int prescale_crop_en;
-	int postscale_crop_en;
-};
-
-struct msm_cpp_frame_info_t {
-	int32_t frame_id;
-	uint32_t inst_id;
-	uint32_t client_id;
-	enum msm_cpp_frame_type frame_type;
-	uint32_t num_strips;
-	struct msm_cpp_frame_strip_info *strip_info;
-	uint32_t msg_len;
-	uint32_t *cpp_cmd_msg;
-	int src_fd;
-	int dst_fd;
-	struct ion_handle *src_ion_handle;
-	struct ion_handle *dest_ion_handle;
-};
-
-struct cpp_hw_info {
-	uint32_t cpp_hw_version;
-	uint32_t cpp_hw_caps;
-};
-
-#define VIDIOC_MSM_CPP_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE, struct msm_camera_v4l2_ioctl_t)
-
-#define VIDIOC_MSM_CPP_GET_EVENTPAYLOAD \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct msm_camera_v4l2_ioctl_t)
-
-#define VIDIOC_MSM_CPP_GET_INST_INFO \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 2, struct msm_camera_v4l2_ioctl_t)
-
-#define VIDIOC_MSM_CPP_LOAD_FIRMWARE \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 3, struct msm_camera_v4l2_ioctl_t)
-
-#define VIDIOC_MSM_CPP_GET_HW_INFO \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 4, struct msm_camera_v4l2_ioctl_t)
-
-#define VIDIOC_MSM_CPP_FLUSH_QUEUE \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 5, struct msm_camera_v4l2_ioctl_t)
-
-#define V4L2_EVENT_CPP_FRAME_DONE  (V4L2_EVENT_PRIVATE_START + 0)
-
-struct msm_camera_v4l2_ioctl_t {
-	uint32_t id;
-	uint32_t len;
-	uint32_t trans_code;
-	void __user *ioctl_ptr;
-};
-
-#endif /* __MSMB_PPROC_H */