camera: Squash reverts to make ZUK's camera working for newer CAF tags

* Squash of:

commit 9c909f4a62201b2ebb0ba56038d31bb85ae55d81
Author: Subhajeet Muhuri <kenny3fcb@gmail.com>
Date:   Sun Oct 28 14:47:09 2018 +0100

    Revert "msm: camera: Add laser LED support for depth sensor"

	* "Camera error: Can't connect to the camera"

    This reverts commit 63f5792c5c6a8de2e40a9eee1195dfa264ff9431.

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit f7229d06853654871e970aa7bf604b01f38c3d37
Author: Subhajeet Muhuri <kenny3fcb@gmail.com>
Date:   Thu Oct 11 20:21:32 2018 +0530

    Revert "msm: camera: Bypass redundant creation of video node in stereo"

	* Camera crashes upon launching

    This reverts commit f977e44aeaf5da07338a4649caa45367461226f0.

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit b0b964a9b6714ee4ff6af4e7f587f99921e3312a
Author: YaroST12 <yaro330@gmail.com>
Date:   Sat Oct 6 18:36:18 2018 +0530

    Revert "msm: cpp: Query buffer from buffer manager based on index"

	* Breaks slow motion video recording

    This reverts commit ddff1a93bac277b1a0ba14c601d5236c3c36365d.

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 5e1c739e4622428fa0b8fd9350946c31d2424b8e
Author: Davide Garberi <dade.garberi@gmail.com>
Date:   Sun Oct 28 14:32:43 2018 +0100

    Revert "msm: camera: Framedrop notification"

    This reverts commit 5925180360bca209c21e9271e277caaca68bcad5.

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 0ef5dc40955cd7946f0a851feda516c34dc40d6d
Author: YaroST12 <yaro330@gmail.com>
Date:   Sat Oct 6 18:31:20 2018 +0530

    Revert "msm: camera: sensor: Adapting sensor driver to soc layer"

	* Kernel panics at boot

    This reverts commit 6b99b4c9a1706f8f7f1745af97e0f4bddecf168b.

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 1da8c59614f005d524455147fd78fc5f32cfa33b
Author: Subhajeet Muhuri <kenny3fcb@gmail.com>
Date:   Fri Oct 5 12:24:29 2018 +0530

    Revert "msm: camera: sensor: Updating soc layer clock API for i2c drivers"

	* Required for the proper revert of 6b99b4c

    This reverts commit a4663702036e6b0ae9b82691027d9913d65d7a02.

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 1b138397ea01ae70f653baf6c812fb5748b3783b
Author: Subhajeet Muhuri <kenny3fcb@gmail.com>
Date:   Sat Oct 6 18:19:19 2018 +0530

    Revert "msm: camera: Add regulator enable and disable independent of CSID"

    * Required for the proper revert of 6b99b4c

    This reverts commit fd39134867896ec5c28ce348816e31e7785e06ba.

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 12e0c65509260092e8c3f22717080427a78c9469
Author: Subhajeet Muhuri <kenny3fcb@gmail.com>
Date:   Sat Oct 6 18:16:32 2018 +0530

    Revert "msm: camera: Add regulator enable and disable in csiphy"

    * Required for the proper revert of 6b99b4c

    This reverts commit d3e47e331617af3c87138bd205e65c6fa1a1bca7.

Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Change-Id: Iaa6aa22bb518b930141092fab9f51567c7eae092

4 files changed, 0 insertions, 26 deletions

diff --git a/include/uapi/media/msm_cam_sensor.h b/include/uapi/media/msm_cam_sensor.h
index e4b4554dd690..2f10a300b817 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;
@@ -630,8 +620,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