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

Commit ee8f3e18 authored by yungwenpeng's avatar yungwenpeng
Browse files

Merge branch vanilla into gms 

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9:
  [Camera] The define declare and common message modified
Change-Id: Ib06439fd344479be623cb04f6a0ce0d7fedfa248
parents 02bd1d3c f7cd0083

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

+20 −0
Original line number Diff line number Diff line
@@ -26,6 +26,26 @@ 
#undef CDBG

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



//<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_DBG )

  #undef CAM_DBG

#endif



#if defined( MULTI_CAMERA_POWER_ON )

//#define   CAM_DBG(fmt, args...)    pr_debug(fmt, ##args)

#define   CAM_DBG(fmt, args...)    pr_err(fmt, ##args)



int   iovdd_count = 0;

#else

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

#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,

	int num_vreg, struct msm_sensor_power_setting *power_setting,

	uint16_t power_setting_size)