Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert "msm: camera: add support to update sensor output format""

This commit is contained in:
Linux Build Service Account 2015-01-25 13:10:58 -08:00 committed by Gerrit - the friendly Code Review server
parent 388b605595 3a314abaf8
commit 89e32cb540
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c
View File

@ -635,7 +635,6 @@ int32_t msm_sensor_driver_probe(void *setting,
struct msm_camera_slave_info *camera_info = NULL;
unsigned long mount_pos = 0;
uint32_t is_bayer;
/* Validate input parameters */
if (!setting) {
@ -696,7 +695,6 @@ int32_t msm_sensor_driver_probe(void *setting,
setting32.is_init_params_valid;
slave_info->sensor_init_params = setting32.sensor_init_params;
slave_info->is_flash_supported = setting32.is_flash_supported;
slave_info->output_format = setting32.output_format;
} else
#endif
{
@ -923,10 +921,7 @@ int32_t msm_sensor_driver_probe(void *setting,
goto free_camera_info;
}
/* Update sensor mount angle and position in media entity flag */
is_bayer = (slave_info->output_format == MSM_SENSOR_BAYER) ? 1 : 0;
mount_pos = is_bayer << 24;
mount_pos = mount_pos | (s_ctrl->sensordata->
sensor_info->position << 16);
mount_pos = s_ctrl->sensordata->sensor_info->position << 16;
mount_pos = mount_pos | ((s_ctrl->sensordata->sensor_info->
sensor_mount_angle / 90) << 8);
s_ctrl->msm_sd.sd.entity.flags = mount_pos | MEDIA_ENT_FL_DEFAULT;

1
include/media/msm_cam_sensor.h
View File

@ -312,7 +312,6 @@ struct msm_camera_sensor_slave_info32 {
uint8_t is_init_params_valid;
struct msm_sensor_init_params sensor_init_params;
uint8_t is_flash_supported;
enum msm_sensor_output_format_type output_format;
};
struct msm_camera_csid_lut_params32 {

6
include/media/msm_camsensor_sdk.h
View File

@ -180,11 +180,6 @@ enum msm_flash_cfg_type_t {
CFG_FLASH_HIGH,
};
enum msm_sensor_output_format_type {
MSM_SENSOR_BAYER,
MSM_SENSOR_YCBCR
};
struct msm_sensor_power_setting {
enum msm_sensor_power_seq_type_t seq_type;
uint16_t seq_val;
@ -232,7 +227,6 @@ struct msm_camera_sensor_slave_info {
uint8_t is_init_params_valid;
struct msm_sensor_init_params sensor_init_params;
uint8_t is_flash_supported;
enum msm_sensor_output_format_type output_format;
};
struct msm_camera_i2c_reg_array {