summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/i2c-dev.h3
-rw-r--r--include/uapi/linux/input-event-codes.h12
-rw-r--r--include/uapi/linux/msm_mdp.h43
-rw-r--r--include/uapi/media/msm_cam_sensor.h15
-rw-r--r--include/uapi/media/msm_camsensor_sdk.h10
-rw-r--r--include/uapi/media/msmb_camera.h1
-rw-r--r--include/uapi/media/msmb_generic_buf_mgr.h2
-rw-r--r--include/uapi/media/msmb_ispif.h14
8 files changed, 61 insertions, 39 deletions
diff --git a/include/uapi/linux/i2c-dev.h b/include/uapi/linux/i2c-dev.h
index 2f05e66de01e..ed05615003c1 100644
--- a/include/uapi/linux/i2c-dev.h
+++ b/include/uapi/linux/i2c-dev.h
@@ -49,6 +49,9 @@
#define I2C_RDWR 0x0707 /* Combined R/W transfer (one STOP only) */
#define I2C_PEC 0x0708 /* != 0 to use PEC with SMBus */
+
+#define ENABLE_MI2S_CLK 0x0709 /* Enable mi2s clock*/
+
#define I2C_SMBUS 0x0720 /* SMBus transfer */
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 0d9bac9f9ebb..13eff35ffe5e 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -301,6 +301,10 @@
#define KEY_BRIGHTNESSUP 225
#define KEY_MEDIA 226
+#define KEY_NAVI_RIGHT 249
+#define KEY_NAVI_LEFT 254
+#define KEY_NAVI_LONG 183
+
#define KEY_SWITCHVIDEOMODE 227 /* Cycle between available video
outputs (Monitor/LCD/TV-out/etc) */
#define KEY_KBDILLUMTOGGLE 228
@@ -580,6 +584,14 @@
#define KEY_CAMERA_DOWN 0x218
#define KEY_CAMERA_LEFT 0x219
#define KEY_CAMERA_RIGHT 0x21a
+#define KEY_GESTURE_C 0x21b
+#define KEY_GESTURE_LR 0x21c
+#define KEY_GESTURE_RL 0x21d
+#define KEY_GESTURE_DT 0x21e
+#define KEY_GESTURE_V 0x21f
+#define KEY_GESTURE_E 0x220
+#define KEY_GESTURE_M 0x221
+#define KEY_GESTURE_W 0x222
#define KEY_ATTENDANT_ON 0x21b
#define KEY_ATTENDANT_OFF 0x21c
diff --git a/include/uapi/linux/msm_mdp.h b/include/uapi/linux/msm_mdp.h
index 481814cb8498..e0aee17411d3 100644
--- a/include/uapi/linux/msm_mdp.h
+++ b/include/uapi/linux/msm_mdp.h
@@ -1315,6 +1315,49 @@ struct msmfb_metadata {
int fbmem_ionfd;
} data;
};
+#ifdef CONFIG_MACH_ZUK_Z2_ROW
+#define EFFECT_COUNT 16
+#define MODE_COUNT 8
+#define NAME_SIZE 16
+
+typedef enum {
+ GET_EFFECT_NUM = 1,
+ GET_EFFECT_LEVEL,
+ GET_EFFECT,
+ GET_MODE_NUM,
+ GET_MODE,
+ SET_EFFECT,
+ SET_MODE,
+ SET_BL_LEVEL,
+ GET_BL_LEVEL,
+} ctrl_id;
+
+struct hal_lcd_effect {
+ char name[NAME_SIZE];
+ int max_level;
+ int level;
+};
+
+struct hal_lcd_mode {
+ char name[NAME_SIZE];
+};
+
+struct hal_panel_data {
+ struct hal_lcd_effect effect[EFFECT_COUNT];
+ struct hal_lcd_mode mode[MODE_COUNT];
+ int effect_cnt;
+ int mode_cnt;
+ int current_mode;
+};
+
+struct hal_panel_ctrl_data {
+ struct hal_panel_data panel_data;
+ int level;
+ int mode;
+ int index;
+ ctrl_id id;
+};
+#endif
#define MDP_MAX_FENCE_FD 32
#define MDP_BUF_SYNC_FLAG_WAIT 1
diff --git a/include/uapi/media/msm_cam_sensor.h b/include/uapi/media/msm_cam_sensor.h
index e4b4554dd690..0bd2168da68b 100644
--- a/include/uapi/media/msm_cam_sensor.h
+++ b/include/uapi/media/msm_cam_sensor.h
@@ -90,7 +90,6 @@ enum sensor_sub_module_t {
SUB_MODULE_EXT,
SUB_MODULE_IR_LED,
SUB_MODULE_IR_CUT,
- SUB_MODULE_LASER_LED,
SUB_MODULE_MAX,
};
@@ -304,15 +303,6 @@ struct msm_ir_cut_cfg_data_t {
enum msm_ir_cut_cfg_type_t cfg_type;
};
-struct msm_laser_led_cfg_data_t {
- enum msm_laser_led_cfg_type_t cfg_type;
- void __user *setting;
- void __user *debug_reg;
- uint32_t debug_reg_size;
- uint16_t i2c_addr;
- enum i2c_freq_mode_t i2c_freq_mode;
-};
-
struct msm_eeprom_cfg_data {
enum eeprom_cfg_type_t cfgtype;
uint8_t is_supported;
@@ -357,6 +347,8 @@ enum msm_sensor_cfg_type_t {
CFG_WRITE_I2C_ARRAY_ASYNC,
CFG_WRITE_I2C_ARRAY_SYNC,
CFG_WRITE_I2C_ARRAY_SYNC_BLOCK,
+ CFG_RELEASE_CCI,
+ CFG_INIT_CCI
};
enum msm_actuator_cfg_type_t {
@@ -630,8 +622,5 @@ struct sensor_init_cfg_data {
#define VIDIOC_MSM_IR_CUT_CFG \
_IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct msm_ir_cut_cfg_data_t)
-#define VIDIOC_MSM_LASER_LED_CFG \
- _IOWR('V', BASE_VIDIOC_PRIVATE + 16, struct msm_laser_led_cfg_data_t)
-
#endif
diff --git a/include/uapi/media/msm_camsensor_sdk.h b/include/uapi/media/msm_camsensor_sdk.h
index 40731a927ce5..2f7bc77887ad 100644
--- a/include/uapi/media/msm_camsensor_sdk.h
+++ b/include/uapi/media/msm_camsensor_sdk.h
@@ -48,8 +48,6 @@
#define MSM_EEPROM_MEMORY_MAP_MAX_SIZE 80
#define MSM_EEPROM_MAX_MEM_MAP_CNT 8
-#define MSM_SENSOR_BYPASS_VIDEO_NODE 1
-
#define FRONT_AUX_SENSOR_SUPPORT
enum msm_sensor_camera_id_t {
@@ -211,13 +209,6 @@ enum msm_ir_led_cfg_type_t {
#define CFG_IR_LED_OFF CFG_IR_LED_OFF
#define CFG_IR_LED_ON CFG_IR_LED_ON
-enum msm_laser_led_cfg_type_t {
- CFG_LASER_LED_INIT,
- CFG_LASER_LED_CONTROL,
-};
-#define CFG_LASER_LED_INIT CFG_LASER_LED_INIT
-#define CFG_LASER_LED_CONTROL CFG_LASER_LED_CONTROL
-
enum msm_ir_cut_cfg_type_t {
CFG_IR_CUT_INIT = 0,
CFG_IR_CUT_RELEASE,
@@ -316,7 +307,6 @@ struct msm_camera_sensor_slave_info {
unsigned char is_init_params_valid;
struct msm_sensor_init_params sensor_init_params;
enum msm_sensor_output_format_t output_format;
- uint8_t bypass_video_node_creation;
};
struct msm_camera_i2c_reg_array {
diff --git a/include/uapi/media/msmb_camera.h b/include/uapi/media/msmb_camera.h
index 0a2dd446ccc4..d9e085c9f7b5 100644
--- a/include/uapi/media/msmb_camera.h
+++ b/include/uapi/media/msmb_camera.h
@@ -52,7 +52,6 @@
#define MSM_CAMERA_SUBDEV_IR_CUT 18
#define MSM_CAMERA_SUBDEV_EXT 19
#define MSM_CAMERA_SUBDEV_TOF 20
-#define MSM_CAMERA_SUBDEV_LASER_LED 21
#define MSM_MAX_CAMERA_SENSORS 6
/* The below macro is defined to put an upper limit on maximum
diff --git a/include/uapi/media/msmb_generic_buf_mgr.h b/include/uapi/media/msmb_generic_buf_mgr.h
index 8dad9ae92cf8..2961cae1e7c1 100644
--- a/include/uapi/media/msmb_generic_buf_mgr.h
+++ b/include/uapi/media/msmb_generic_buf_mgr.h
@@ -62,7 +62,5 @@ struct msm_buf_mngr_main_cont_info {
_IOWR('V', BASE_VIDIOC_PRIVATE + 40, \
struct msm_camera_private_ioctl_arg)
-#define VIDIOC_MSM_BUF_MNGR_BUF_ERROR \
- _IOWR('V', BASE_VIDIOC_PRIVATE + 41, struct msm_buf_mngr_info)
#endif
diff --git a/include/uapi/media/msmb_ispif.h b/include/uapi/media/msmb_ispif.h
index d532037427cc..3720056aa28d 100644
--- a/include/uapi/media/msmb_ispif.h
+++ b/include/uapi/media/msmb_ispif.h
@@ -36,6 +36,7 @@ enum msm_ispif_intftype {
#define RDI1_MASK (1 << RDI1)
#define RDI2_MASK (1 << RDI2)
+
enum msm_ispif_vc {
VC0,
VC1,
@@ -101,18 +102,10 @@ struct msm_ispif_params_entry {
uint16_t crop_end_pixel;
};
-struct msm_ispif_right_param_entry {
- enum msm_ispif_cid cids[MAX_CID_CH_PARAM_ENTRY];
- enum msm_ispif_csid csid;
-};
-
struct msm_ispif_param_data_ext {
uint32_t num;
struct msm_ispif_params_entry entries[MAX_PARAM_ENTRIES];
struct msm_ispif_pack_cfg pack_cfg[CID_MAX];
- struct msm_ispif_right_param_entry right_entries[MAX_PARAM_ENTRIES];
- uint32_t stereo_enable;
- uint16_t line_width[VFE_MAX];
};
struct msm_ispif_param_data {
@@ -144,7 +137,6 @@ enum ispif_cfg_type_t {
ISPIF_ENABLE_REG_DUMP,
ISPIF_SET_VFE_INFO,
ISPIF_CFG2,
- ISPIF_CFG_STEREO,
};
struct ispif_cfg_data {
@@ -165,10 +157,6 @@ struct ispif_cfg_data_ext {
#define ISPIF_RDI_PACK_MODE_SUPPORT 1
-#define ISPIF_3D_SUPPORT 1
-
-#define ISPIF_LINE_WIDTH_SUPPORT 1
-
#define VIDIOC_MSM_ISPIF_CFG \
_IOWR('V', BASE_VIDIOC_PRIVATE, struct ispif_cfg_data)