samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Tükrözés 0
Kód Hibajegyek Egyesítési kérések Actions Packages Projektek Kiadások Wiki Tevékenység

Merge "msm: camera: cci: Add report id in report command for CCI I2C queue" into camera-kernel.lnx.5.0

Forráskód böngészése
This commit is contained in:
Haritha Chintalapati
2021-05-06 20:32:01 -07:00
committed by Gerrit - the friendly Code Review server
szülő bd5db9e311 5f3d4a34ac
commit 212ab43481
2 fájl változott, egészen pontosan 19 új sor hozzáadva és 3 régi sor törölve
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/cam_sensor_module/cam_cci/cam_cci_core.c
Fájl megtekintése

@@ -104,13 +104,20 @@ static int32_t cam_cci_validate_queue(struct cci_device *cci_dev,
if ((read_val + len + 1) >
cci_dev->cci_i2c_queue_info[master][queue].max_queue_size) {
uint32_t reg_val = 0;
uint32_t report_val = CCI_I2C_REPORT_CMD | (1 << 8);
uint32_t report_id =
cci_dev->cci_i2c_queue_info[master][queue].report_id;
uint32_t report_val = CCI_I2C_REPORT_CMD | (1 << 8) |
(1 << 9) | (report_id << 4);
CAM_DBG(CAM_CCI, "CCI_I2C_REPORT_CMD");
cam_io_w_mb(report_val,
base + CCI_I2C_M0_Q0_LOAD_DATA_ADDR +
reg_offset);
read_val++;
cci_dev->cci_i2c_queue_info[master][queue].report_id++;
if (cci_dev->cci_i2c_queue_info[master][queue].report_id == REPORT_IDSIZE)
cci_dev->cci_i2c_queue_info[master][queue].report_id = 0;
CAM_DBG(CAM_CCI,
"CCI_I2C_M0_Q0_EXEC_WORD_CNT_ADDR %d, queue: %d",
read_val, queue);
@@ -305,14 +312,22 @@ static void cam_cci_load_report_cmd(struct cci_device *cci_dev,
uint32_t reg_offset = master * 0x200 + queue * 0x100;
uint32_t read_val = cam_io_r_mb(base +
CCI_I2C_M0_Q0_CUR_WORD_CNT_ADDR + reg_offset);
uint32_t report_val = CCI_I2C_REPORT_CMD | (1 << 8);
uint32_t report_id =
cci_dev->cci_i2c_queue_info[master][queue].report_id;
uint32_t report_val = CCI_I2C_REPORT_CMD | (1 << 8) |
(1 << 9) | (report_id << 4);
CAM_DBG(CAM_CCI, "CCI_I2C_REPORT_CMD curr_w_cnt: %d", read_val);
CAM_DBG(CAM_CCI, "CCI_I2C_REPORT_CMD curr_w_cnt: %d report_id %d",
read_val, report_id);
cam_io_w_mb(report_val,
base + CCI_I2C_M0_Q0_LOAD_DATA_ADDR +
reg_offset);
read_val++;
cci_dev->cci_i2c_queue_info[master][queue].report_id++;
if (cci_dev->cci_i2c_queue_info[master][queue].report_id == REPORT_IDSIZE)
cci_dev->cci_i2c_queue_info[master][queue].report_id = 0;
CAM_DBG(CAM_CCI, "CCI_I2C_M0_Q0_EXEC_WORD_CNT_ADDR %d", read_val);
cam_io_w_mb(read_val, base +
CCI_I2C_M0_Q0_EXEC_WORD_CNT_ADDR + reg_offset);

1
drivers/cam_sensor_module/cam_cci/cam_cci_dev.h
Fájl megtekintése

@@ -66,6 +66,7 @@
#define CAM_CCI_TIMEOUT_DUMP_EN BIT(2)
#define CCI_VERSION_1_2_9 0x10020009
#define REPORT_IDSIZE 16
enum cci_i2c_sync {
MSM_SYNC_DISABLE,
MSM_SYNC_ENABLE,