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

Commit 6f6ba5ba authored by yungwenpeng's avatar yungwenpeng
Browse files

Merge branch vanilla into gms 

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9:
  The define declare and common message modified

Change-Id: Ibd40a2f79b79195d5027776e038f60dbba5b9676
parents f18de41c 5d909e8a

drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c

+12 −12
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ 
#undef CDBG

#define CDBG(fmt, args...) pr_debug(fmt, ##args)



//<2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]Add for CTS testMultiCameraRelease fail issue.

//<2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]Add for camera power re-open control when multicamera operate.

#if defined( MULTI_CAMERA_POWER_ON )

  #undef  MULTI_CAMERA_POWER_ON

#endif

  #define   MULTI_CAMERA_POWER_ON



#if defined( CAM_CDBG )

#if defined( CAM_DBG )

  #undef CAM_DBG

#endif
@@ -42,7 +42,7 @@ 
int   iovdd_count = 0;

#else

#define   CAM_DBG(fmt, args...)    do{}while(0)

#endif

#endif /* End..(MULTI_CAMERA_POWER_ON) */

//>2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][].



int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg,
@@ -1515,7 +1515,7 @@ int msm_camera_power_up(struct msm_camera_power_ctrl_t *ctrl, 
			CDBG("%s:%d gpio set val %d\n", __func__, __LINE__,

				ctrl->gpio_conf->gpio_num_info->gpio_num

				[power_setting->seq_val]);

		//<2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][CTS][]Add and modified for CTS testMultiCameraRelease fail issue.

		//<2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]Add for camera power re-open control when multicamera operate.

		#if defined( MULTI_CAMERA_POWER_ON )

			if( power_setting->seq_val == SENSOR_GPIO_VIO )

			{
@@ -1540,7 +1540,7 @@ int msm_camera_power_up(struct msm_camera_power_ctrl_t *ctrl, 
				[power_setting->seq_val],

				(int) power_setting->config_val);

		#endif /* End..(MULTI_CAMERA_POWER_ON) */

		//>2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][CTS][].

		//>2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][].

			break;

		case SENSOR_VREG:

			if (power_setting->seq_val == INVALID_VREG)
@@ -1614,7 +1614,7 @@ int msm_camera_power_up(struct msm_camera_power_ctrl_t *ctrl, 
			if (!ctrl->gpio_conf->gpio_num_info->valid

				[power_setting->seq_val])

				continue;

		//<2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][CTS][]Add and modified for CTS testMultiCameraRelease fail issue.

		//<2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]Add for camera power re-open control when multicamera operate.

		#if defined( MULTI_CAMERA_POWER_ON )

			if( power_setting->seq_val == SENSOR_GPIO_VIO )

			{
@@ -1638,7 +1638,7 @@ int msm_camera_power_up(struct msm_camera_power_ctrl_t *ctrl, 
				ctrl->gpio_conf->gpio_num_info->gpio_num

				[power_setting->seq_val], GPIOF_OUT_INIT_LOW);

		#endif  /* end..(MULTI_CAMERA_POWER_ON) */

		//>2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][CTS][].

		//>2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][].

			break;

		case SENSOR_VREG:

			if (power_setting->seq_val < ctrl->num_vreg)
@@ -1747,7 +1747,7 @@ int msm_camera_power_down(struct msm_camera_power_ctrl_t *ctrl, 
			if (!ctrl->gpio_conf->gpio_num_info->valid

				[pd->seq_val])

				continue;

		//<2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][CTS][]Add and modified for CTS testMultiCameraRelease fail issue.

		//<2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]Add for camera power re-open control when multicamera operate.

		#if defined( MULTI_CAMERA_POWER_ON )

			if( pd->seq_val == SENSOR_GPIO_VIO )

			{
@@ -1772,7 +1772,7 @@ int msm_camera_power_down(struct msm_camera_power_ctrl_t *ctrl, 
				[pd->seq_val],

				(int) pd->config_val);

		#endif  /* end..(MULTI_CAMERA_POWER_ON) */

		//>2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][CTS][].

		//>2019/05/10-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][].

			break;

		case SENSOR_VREG:

			if (pd->seq_val == INVALID_VREG)