Merge "msm: camera: Reduce CDM reset timeout to 300msec" into dev/msm-4.9-camx

#define CAM_MAX_SW_CDM_VERSION_SUPPORTED  1

#define CAM_MAX_SW_CDM_VERSION_SUPPORTED  1

#define CAM_SW_CDM_INDEX                  0

#define CAM_SW_CDM_INDEX                  0

#define CAM_CDM_INFLIGHT_WORKS            5

#define CAM_CDM_INFLIGHT_WORKS            5

#define CAM_CDM_HW_RESET_TIMEOUT          3000

#define CAM_CDM_HW_RESET_TIMEOUT          300

#define CAM_CDM_HW_ID_MASK      0xF

#define CAM_CDM_HW_ID_MASK      0xF

#define CAM_CDM_HW_ID_SHIFT     0x5

#define CAM_CDM_HW_ID_SHIFT     0x5