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

Commit 92676289 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: add support to update sensor output format"

parents 8d47975f 931732d0

drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c

+7 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -635,6 +635,7 @@ 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) {
@@ -695,6 +696,7 @@ 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

	{
@@ -921,7 +923,10 @@ int32_t msm_sensor_driver_probe(void *setting, 
		goto free_camera_info;

	}

	/* Update sensor mount angle and position in media entity flag */

	mount_pos = s_ctrl->sensordata->sensor_info->position << 16;

	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 = 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;

include/media/msm_cam_sensor.h

+1 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ 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 {

include/media/msm_camsensor_sdk.h

+6 −0
Original line number Diff line number Diff line
@@ -180,6 +180,11 @@ 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;
@@ -227,6 +232,7 @@ 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 {