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

Commit bf90c1b1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Add support for front aux sensor"

parents 55df6dc8 dd8f83fe

include/uapi/media/msm_camera.h

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ struct msm_mctl_post_proc_cmd { 
#define MSM_CAMERA_STROBE_FLASH_NONE 0

#define MSM_CAMERA_STROBE_FLASH_XENON 1



#define MSM_MAX_CAMERA_SENSORS  5

#define MSM_MAX_CAMERA_SENSORS  6

#define MAX_SENSOR_NAME 32

#define MAX_CAM_NAME_SIZE 32

#define MAX_ACT_MOD_NAME_SIZE 32

include/uapi/media/msm_camsensor_sdk.h

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 


#define MSM_SENSOR_BYPASS_VIDEO_NODE    1



#define FRONT_AUX_SENSOR_SUPPORT



enum msm_sensor_camera_id_t {

	CAMERA_0,

	CAMERA_1,
@@ -70,6 +72,7 @@ enum camb_position_t { 
	BACK_CAMERA_B,

	FRONT_CAMERA_B,

	AUX_CAMERA_B = 0x100,

	FRONT_AUX_CAMERA_B,

	INVALID_CAMERA_B,

};

include/uapi/media/msmb_camera.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#define MSM_CAMERA_SUBDEV_EXT          19

#define MSM_CAMERA_SUBDEV_TOF          20

#define MSM_CAMERA_SUBDEV_LASER_LED    21

#define MSM_MAX_CAMERA_SENSORS  5

#define MSM_MAX_CAMERA_SENSORS  6



/* The below macro is defined to put an upper limit on maximum

 * number of buffer requested per stream. In case of extremely