A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 14:13:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

rhodec: fixed macro camera not being opened

Browse source 
detalis:
switch the cci device to read the flash ID

Change-Id: Idf29474ca4946afb122339eeefe01b7dacfc0485
Signed-off-by: liuzy55 <liuzy55@motorola.com>
Reviewed-on: https://gerrit.mot.com/2191857
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Reviewed-by: Long Cheng <chengl1@motorola.com>
Tested-by: Jira Key
Reviewed-by: XiaoFeng Wang <wangxf32@lenovo.com>
Reviewed-by: Shuo Wang <wangsh18@motorola.com>
Reviewed-by: Xingyun Fu <fuxy7@motorola.com>
Reviewed-by: Zhichao Chen <chenzc2@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
liuzy55 2022-02-16 14:44:34 +08:00 • committed by zhaoji1
commit 9fba93b60c
3 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/cam_sensor_module/cam_sensor/cam_sensor_core.c
View file

@ -452,6 +452,7 @@ int32_t cam_sensor_update_slave_info(struct cam_cmd_probe *probe_info,
s_ctrl->sub_device_id_addr = probe_info->sub_device_id_addr;
s_ctrl->expected_sub_device_id = probe_info->expected_sub_device_id;
s_ctrl->sub_device_cci_master = probe_info->sub_device_cci_master;
s_ctrl->sub_device_cci_device = probe_info->sub_device_cci_device;
s_ctrl->sub_device_i2c_freq_mode = probe_info->sub_device_i2c_freq_mode;
CAM_DBG(CAM_SENSOR,
@ -721,6 +722,7 @@ int cam_sensor_match_sub_device_id(struct cam_sensor_ctrl_t *s_ctrl)
uint16_t sensor_address = 0;
uint16_t sensor_freq_mode = 0;
uint8_t sensor_cci_master = 0;
uint8_t sensor_cci_device = 0;
/* if hal doesn't config ProbeSubDevice parameter in sensor xml, return success immediately */
if (!s_ctrl->probe_sub_device) {
@ -739,6 +741,7 @@ int cam_sensor_match_sub_device_id(struct cam_sensor_ctrl_t *s_ctrl)
if (s_ctrl->need_change_cci_master) {
sensor_cci_master = s_ctrl->io_master_info.cci_client->cci_i2c_master;
sensor_freq_mode = s_ctrl->io_master_info.cci_client->i2c_freq_mode;
sensor_cci_device = s_ctrl->io_master_info.cci_client->cci_device;
ret = camera_io_release(&(s_ctrl->io_master_info));
if (ret != 0) {
@ -748,6 +751,10 @@ int cam_sensor_match_sub_device_id(struct cam_sensor_ctrl_t *s_ctrl)
s_ctrl->io_master_info.cci_client->cci_i2c_master = s_ctrl->sub_device_cci_master;
s_ctrl->io_master_info.cci_client->i2c_freq_mode = s_ctrl->sub_device_i2c_freq_mode;
if(s_ctrl->io_master_info.cci_client->cci_device != s_ctrl->sub_device_cci_device)
{
s_ctrl->io_master_info.cci_client->cci_device = s_ctrl->sub_device_cci_device;
}
rc = camera_io_init(&(s_ctrl->io_master_info));
if(rc != 0) {
ret = camera_io_release(&(s_ctrl->io_master_info));
@ -783,6 +790,7 @@ int cam_sensor_match_sub_device_id(struct cam_sensor_ctrl_t *s_ctrl)
s_ctrl->io_master_info.cci_client->cci_i2c_master = sensor_cci_master;
s_ctrl->io_master_info.cci_client->i2c_freq_mode = sensor_freq_mode;
s_ctrl->io_master_info.cci_client->cci_device = sensor_cci_device;
rc = camera_io_init(&(s_ctrl->io_master_info));
if(rc != 0) {

1
drivers/cam_sensor_module/cam_sensor/cam_sensor_dev.h
View file

@ -118,6 +118,7 @@ struct cam_sensor_ctrl_t {
uint16_t sub_device_id_addr;
uint16_t expected_sub_device_id;
uint8_t sub_device_cci_master;
uint8_t sub_device_cci_device;
uint8_t sub_device_i2c_freq_mode;
bool need_change_cci_master;
};

1
include/uapi/camera/media/cam_sensor.h
View file

@ -179,6 +179,7 @@ struct cam_cmd_probe {
__u32 sub_device_id_addr;
__u32 expected_sub_device_id;
__u8 sub_device_cci_master;
__u8 sub_device_cci_device;
__u8 sub_device_i2c_freq_mode;
} __attribute__((packed));