From 240f7223c4ca4658542227aa014bd02362861586 Mon Sep 17 00:00:00 2001 From: Dohyun Kim Date: Wed, 15 May 2019 15:52:19 +0900 Subject: [PATCH] [9610] fimc-is2: eeprom loading sequence change Change-Id: I02f44fd496598aa2812642b2daa4aa326558089e Signed-off-by: Dohyun Kim --- .../eeprom/fimc-is-sensor-eeprom-12a10.c | 76 +++++++------------ .../eeprom/fimc-is-sensor-eeprom-12a10ff.c | 58 ++++---------- .../eeprom/fimc-is-sensor-eeprom-16885c.c | 58 ++++---------- .../fimc-is-device-sensor-peri.h | 2 + 4 files changed, 63 insertions(+), 131 deletions(-) diff --git a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-12a10.c b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-12a10.c index 45e23271b657..dd579c02cee0 100644 --- a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-12a10.c +++ b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-12a10.c @@ -34,6 +34,7 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) struct fimc_is_module_enum *module; struct fimc_is_eeprom *eeprom = NULL; struct fimc_is_device_sensor *sensor = NULL; + int ret_sum = 0; FIMC_BUG(!subdev); @@ -70,6 +71,7 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to Information cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_info, subdev); if (ret) { + ret_sum++; err("%s(): 12A10 EEPROM Information CRC section check fail(%d)", __func__, ret); /* All calibration data is 0xff set but exception Address section */ @@ -81,11 +83,12 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) info("12A10 EEPROM Informaion section CRC check success\n"); sensor->cal_status[CAMERA_CRC_INDEX_MNF] = CRC_NO_ERROR; - } + } /* Check CRC to AWB cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_awb, subdev); if (ret) { + ret_sum++; err("%s(): 12A10 EEPROM AWB section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "AWB", @@ -100,6 +103,7 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) ret = fimc_is_sensor_eeprom_check_awb_ratio(&eeprom->data[EEPROM_AWB_UNIT_OFFSET], &eeprom->data[EEPROM_AWB_GOLDEN_OFFSET],&eeprom->data[EEPROM_AWB_LIMIT_OFFSET]); if (ret) { + ret_sum++; err("%s(): 12A10 EEPROM AWB ratio out of limit(%d)", __func__, ret); sensor->cal_status[CAMERA_CRC_INDEX_AWB] = LIMIT_FAILURE; @@ -109,6 +113,7 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to AF cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_af, subdev); if (ret) { + ret_sum++; err("%s(): 12A10 EEPROM AF section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "AF", @@ -124,6 +129,7 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to LSC cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_lsc, subdev); if (ret) { + ret_sum++; err("%s(): 12A10 EEPROM LSC section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "LSC", @@ -134,6 +140,7 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to PDAF cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_pdaf, subdev); if (ret) { + ret_sum++; err("%s(): 12A10 EEPROM PDAF section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "PDAF", @@ -149,6 +156,7 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to AE Sync cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_ae, subdev); if (ret) { + ret_sum++; err("%s(): 12A10 EEPROM AE section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "AE", @@ -159,6 +167,7 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to Dual cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_dual, subdev); if (ret) { + ret_sum++; err("%s(): EEPROM Dual section check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "DUAL", @@ -174,6 +183,7 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to SFR cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_sfr, subdev); if (ret) { + ret_sum++; err("%s(): EEPROM SFR section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "SFR", @@ -185,20 +195,23 @@ int fimc_is_eeprom_12a10_check_all_crc(struct v4l2_subdev *subdev) * Write files to serial number and Dual cal data when success of * Address, Info, Dual calibration data */ - if (!sensor->cal_status[CAMERA_CRC_INDEX_DUAL]) { + if (!sensor->cal_status[CAMERA_CRC_INDEX_DUAL] && !eeprom->file_write) { ret = fimc_is_eeprom_file_write(EEPROM_SERIAL_NUM_DATA_PATH, (void *)&eeprom->data[EEPROM_INFO_SERIAL_NUM_START], EEPROM_INFO_SERIAL_NUM_SIZE); - if (ret < 0) + if (ret < 0) { err("%s(), Serial number file write fail(%d)", __func__, ret); - + ret_sum++; + } /* Write file to Dual calibration data */ ret = fimc_is_eeprom_file_write(EEPROM_DUAL_DATA_PATH, (void *)&eeprom->data[EEPROM_DUAL_CRC_CHK_START], EEPROM_DUAL_CAL_SIZE); - if (ret < 0) + if (ret < 0) { + ret_sum++; err("%s(), DUAL cal file write fail(%d)", __func__, ret); + } } - return ret; + return ret_sum; } static int fimc_is_eeprom_12a10_check_address(struct v4l2_subdev *subdev) @@ -450,8 +463,6 @@ int fimc_is_eeprom_12a10_get_cal_data(struct v4l2_subdev *subdev) int ret = 0; struct fimc_is_eeprom *eeprom; struct i2c_client *client; - char serial_id[EEPROM_INFO_SERIAL_NUM_SIZE + 1]; - char serial_id_dump[EEPROM_INFO_SERIAL_NUM_SIZE + 1]; FIMC_BUG(!subdev); @@ -466,23 +477,11 @@ int fimc_is_eeprom_12a10_get_cal_data(struct v4l2_subdev *subdev) return ret; } - I2C_MUTEX_LOCK(eeprom->i2c_lock); - ret = fimc_is_eeprom_module_read(client, EEPROM_INFO_SERIAL_NUM_START, serial_id, EEPROM_INFO_SERIAL_NUM_SIZE); - if (ret < 0) { - err("%s(): eeprom i2c read failed(%d)\n", __func__, ret); - I2C_MUTEX_UNLOCK(eeprom->i2c_lock); - return ret; - } - I2C_MUTEX_UNLOCK(eeprom->i2c_lock); - serial_id[EEPROM_INFO_SERIAL_NUM_SIZE] = '\0'; - /* - * If already read at EEPROM data in module - * don't again read at EEPROM but there isn't file or - * data is NULL read EEPROM data + * EEPROM data file(.bin) will be deleted at every reboot + * so, when eeprom->file_write is zero, there is no eeprom data file */ - ret = fimc_is_eeprom_file_read(EEPROM_DATA_PATH, (void *)eeprom->data, EEPROM_DATA_SIZE); - if (ret) { + if (!eeprom->file_write) { I2C_MUTEX_LOCK(eeprom->i2c_lock); /* I2C read to Sensor EEPROM cal data */ ret = fimc_is_eeprom_module_read(client, EEPROM_ADD_CRC_FST, eeprom->data, EEPROM_DATA_SIZE); @@ -495,7 +494,7 @@ int fimc_is_eeprom_12a10_get_cal_data(struct v4l2_subdev *subdev) /* CRC check to each section cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); - if (ret < 0) + if (ret) err("%s(): eeprom data invalid(%d)\n", __func__, ret); /* Write file to Cal data */ @@ -504,15 +503,12 @@ int fimc_is_eeprom_12a10_get_cal_data(struct v4l2_subdev *subdev) err("%s(), eeprom file write fail(%d)\n", __func__, ret); return ret; } + eeprom->file_write = 1; } else { - memcpy(serial_id_dump, &eeprom->data[EEPROM_INFO_SERIAL_NUM_START], - EEPROM_INFO_SERIAL_NUM_SIZE); - serial_id_dump[EEPROM_INFO_SERIAL_NUM_SIZE] = '\0'; - - if(memcmp(serial_id, serial_id_dump, EEPROM_INFO_SERIAL_NUM_SIZE)) - { - /* Read Sensor EEPROM cause change a module */ - info("%s() : Different new module, so read eeprom\n", __func__); + ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); + if (ret) { + err("%s(): eeprom data invalid(%d)\n", __func__, ret); + err("retry to read data from eeprom module and update file\n"); I2C_MUTEX_LOCK(eeprom->i2c_lock); /* I2C read to Sensor EEPROM cal data */ @@ -526,21 +522,7 @@ int fimc_is_eeprom_12a10_get_cal_data(struct v4l2_subdev *subdev) /* CRC check to each section cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); - if (ret < 0) - err("%s(): eeprom data invalid(%d)\n", __func__, ret); - - /* Write file to Cal data */ - ret = fimc_is_eeprom_file_write(EEPROM_DATA_PATH, (void *)eeprom->data, EEPROM_DATA_SIZE); - if (ret < 0) { - err("%s(), eeprom file write fail(%d)\n", __func__, ret); - return ret; - } - } else { - info("%s(): Same module and file dump so use file dump data\n", __func__); - - /* CRC check to each section cal data */ - ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); - if (ret < 0) + if (ret) err("%s(): eeprom data invalid(%d)\n", __func__, ret); } } diff --git a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-12a10ff.c b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-12a10ff.c index 45d944e594bc..874a1ab50671 100644 --- a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-12a10ff.c +++ b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-12a10ff.c @@ -34,6 +34,7 @@ int fimc_is_eeprom_12a10ff_check_all_crc(struct v4l2_subdev *subdev) struct fimc_is_module_enum *module; struct fimc_is_eeprom *eeprom = NULL; struct fimc_is_device_sensor *sensor = NULL; + int ret_sum = 0; FIMC_BUG(!subdev); @@ -71,6 +72,7 @@ int fimc_is_eeprom_12a10ff_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to Information cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_info, subdev); if (ret) { + ret_sum++; err("%s(): 12A10FF EEPROM Information CRC section check fail(%d)", __func__, ret); /* All calibration data is 0xff set but exception Address section */ @@ -88,6 +90,7 @@ int fimc_is_eeprom_12a10ff_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to AWB cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_awb, subdev); if (ret) { + ret_sum++; err("%s(): 12A10FF EEPROM AWB section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "AWB", @@ -112,6 +115,7 @@ int fimc_is_eeprom_12a10ff_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to LSC cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_lsc, subdev); if (ret) { + ret_sum++; err("%s(): 12A10FF EEPROM LSC section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "LSC", @@ -123,6 +127,7 @@ int fimc_is_eeprom_12a10ff_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to SFR cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_sfr, subdev); if (ret) { + ret_sum++; err("%s(): EEPROM SFR section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "SFR", @@ -131,7 +136,7 @@ int fimc_is_eeprom_12a10ff_check_all_crc(struct v4l2_subdev *subdev) } else info("12A10FF EEPROM SFR section CRC check success\n"); - return ret; + return ret_sum; } static int fimc_is_eeprom_12a10ff_check_address(struct v4l2_subdev *subdev) @@ -269,8 +274,6 @@ int fimc_is_eeprom_12a10ff_get_cal_data(struct v4l2_subdev *subdev) int ret = 0; struct fimc_is_eeprom *eeprom; struct i2c_client *client; - char serial_id[EEPROM_INFO_SERIAL_NUM_SIZE + 1]; - char serial_id_dump[EEPROM_INFO_SERIAL_NUM_SIZE + 1]; FIMC_BUG(!subdev); @@ -285,23 +288,11 @@ int fimc_is_eeprom_12a10ff_get_cal_data(struct v4l2_subdev *subdev) return ret; } - I2C_MUTEX_LOCK(eeprom->i2c_lock); - ret = fimc_is_eeprom_module_read(client, EEPROM_INFO_SERIAL_NUM_START, serial_id, EEPROM_INFO_SERIAL_NUM_SIZE); - if (ret < 0) { - err("%s(): eeprom i2c read failed(%d)\n", __func__, ret); - I2C_MUTEX_UNLOCK(eeprom->i2c_lock); - return ret; - } - I2C_MUTEX_UNLOCK(eeprom->i2c_lock); - serial_id[EEPROM_INFO_SERIAL_NUM_SIZE] = '\0'; - /* - * If already read at EEPROM data in module - * don't again read at EEPROM but there isn't file or - * data is NULL read EEPROM data + * EEPROM data file(.bin) will be deleted at every reboot + * so, when eeprom->file_write is zero, there is no eeprom data file */ - ret = fimc_is_eeprom_file_read(EEPROM_DATA_PATH, (void *)eeprom->data, EEPROM_DATA_SIZE); - if (ret) { + if (!eeprom->file_write) { I2C_MUTEX_LOCK(eeprom->i2c_lock); /* I2C read to Sensor EEPROM cal data */ ret = fimc_is_eeprom_module_read(client, EEPROM_ADD_CRC_FST, eeprom->data, EEPROM_DATA_SIZE); @@ -314,7 +305,7 @@ int fimc_is_eeprom_12a10ff_get_cal_data(struct v4l2_subdev *subdev) /* CRC check to each section cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); - if (ret < 0) + if (ret) err("%s(): eeprom data invalid(%d)\n", __func__, ret); /* Write file to Cal data */ @@ -323,15 +314,12 @@ int fimc_is_eeprom_12a10ff_get_cal_data(struct v4l2_subdev *subdev) err("%s(), eeprom file write fail(%d)\n", __func__, ret); return ret; } + eeprom->file_write = 1; } else { - memcpy(serial_id_dump, &eeprom->data[EEPROM_INFO_SERIAL_NUM_START], - EEPROM_INFO_SERIAL_NUM_SIZE); - serial_id_dump[EEPROM_INFO_SERIAL_NUM_SIZE] = '\0'; - - if(memcmp(serial_id, serial_id_dump, EEPROM_INFO_SERIAL_NUM_SIZE)) - { - /* Read Sensor EEPROM cause change a module */ - info("%s() : Different new module, so read eeprom\n", __func__); + ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); + if (ret) { + err("%s(): eeprom data invalid(%d)\n", __func__, ret); + err("retry to read data from eeprom module and update file\n"); I2C_MUTEX_LOCK(eeprom->i2c_lock); /* I2C read to Sensor EEPROM cal data */ @@ -345,21 +333,7 @@ int fimc_is_eeprom_12a10ff_get_cal_data(struct v4l2_subdev *subdev) /* CRC check to each section cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); - if (ret < 0) - err("%s(): eeprom data invalid(%d)\n", __func__, ret); - - /* Write file to Cal data */ - ret = fimc_is_eeprom_file_write(EEPROM_DATA_PATH, (void *)eeprom->data, EEPROM_DATA_SIZE); - if (ret < 0) { - err("%s(), eeprom file write fail(%d)\n", __func__, ret); - return ret; - } - } else { - info("%s(): Same module and file dump so use file dump data\n", __func__); - - /* CRC check to each section cal data */ - ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); - if (ret < 0) + if (ret) err("%s(): eeprom data invalid(%d)\n", __func__, ret); } } diff --git a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-16885c.c b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-16885c.c index 383a32975483..1e7621fd0a07 100644 --- a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-16885c.c +++ b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/eeprom/fimc-is-sensor-eeprom-16885c.c @@ -34,6 +34,7 @@ int fimc_is_eeprom_16885c_check_all_crc(struct v4l2_subdev *subdev) struct fimc_is_module_enum *module; struct fimc_is_eeprom *eeprom = NULL; struct fimc_is_device_sensor *sensor = NULL; + int ret_sum = 0; FIMC_BUG(!subdev); @@ -71,6 +72,7 @@ int fimc_is_eeprom_16885c_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to Information cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_info, subdev); if (ret) { + ret_sum++; err("%s(): 16885C EEPROM Information CRC section check fail(%d)", __func__, ret); /* All calibration data is 0xff set but exception Address section */ @@ -88,6 +90,7 @@ int fimc_is_eeprom_16885c_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to AWB cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_awb, subdev); if (ret) { + ret_sum++; err("%s(): 16885C EEPROM AWB section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "AWB", @@ -112,6 +115,7 @@ int fimc_is_eeprom_16885c_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to LSC cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_lsc, subdev); if (ret) { + ret_sum++; err("%s(): 16885C EEPROM LSC section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "LSC", @@ -123,6 +127,7 @@ int fimc_is_eeprom_16885c_check_all_crc(struct v4l2_subdev *subdev) /* Check CRC to SFR cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_sfr, subdev); if (ret) { + ret_sum++; err("%s(): EEPROM SFR section CRC check fail(%d)", __func__, ret); fimc_is_eeprom_cal_data_set(eeprom->data, "SFR", @@ -131,7 +136,7 @@ int fimc_is_eeprom_16885c_check_all_crc(struct v4l2_subdev *subdev) } else info("16885C EEPROM SFR section CRC check success\n"); - return ret; + return ret_sum; } static int fimc_is_eeprom_16885c_check_address(struct v4l2_subdev *subdev) @@ -269,8 +274,6 @@ int fimc_is_eeprom_16885c_get_cal_data(struct v4l2_subdev *subdev) int ret = 0; struct fimc_is_eeprom *eeprom; struct i2c_client *client; - char serial_id[EEPROM_INFO_SERIAL_NUM_SIZE + 1]; - char serial_id_dump[EEPROM_INFO_SERIAL_NUM_SIZE + 1]; FIMC_BUG(!subdev); @@ -285,23 +288,11 @@ int fimc_is_eeprom_16885c_get_cal_data(struct v4l2_subdev *subdev) return ret; } - I2C_MUTEX_LOCK(eeprom->i2c_lock); - ret = fimc_is_eeprom_module_read(client, EEPROM_INFO_SERIAL_NUM_START, serial_id, EEPROM_INFO_SERIAL_NUM_SIZE); - if (ret < 0) { - err("%s(): eeprom i2c read failed(%d)\n", __func__, ret); - I2C_MUTEX_UNLOCK(eeprom->i2c_lock); - return ret; - } - I2C_MUTEX_UNLOCK(eeprom->i2c_lock); - serial_id[EEPROM_INFO_SERIAL_NUM_SIZE] = '\0'; - /* - * If already read at EEPROM data in module - * don't again read at EEPROM but there isn't file or - * data is NULL read EEPROM data + * EEPROM data file(.bin) will be deleted at every reboot + * so, when eeprom->file_write is zero, there is no eeprom data file */ - ret = fimc_is_eeprom_file_read(EEPROM_DATA_PATH, (void *)eeprom->data, EEPROM_DATA_SIZE); - if (ret) { + if (!eeprom->file_write) { I2C_MUTEX_LOCK(eeprom->i2c_lock); /* I2C read to Sensor EEPROM cal data */ ret = fimc_is_eeprom_module_read(client, EEPROM_ADD_CRC_FST, eeprom->data, EEPROM_DATA_SIZE); @@ -314,7 +305,7 @@ int fimc_is_eeprom_16885c_get_cal_data(struct v4l2_subdev *subdev) /* CRC check to each section cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); - if (ret < 0) + if (ret) err("%s(): eeprom data invalid(%d)\n", __func__, ret); /* Write file to Cal data */ @@ -323,15 +314,12 @@ int fimc_is_eeprom_16885c_get_cal_data(struct v4l2_subdev *subdev) err("%s(), eeprom file write fail(%d)\n", __func__, ret); return ret; } + eeprom->file_write = 1; } else { - memcpy(serial_id_dump, &eeprom->data[EEPROM_INFO_SERIAL_NUM_START], - EEPROM_INFO_SERIAL_NUM_SIZE); - serial_id_dump[EEPROM_INFO_SERIAL_NUM_SIZE] = '\0'; - - if(memcmp(serial_id, serial_id_dump, EEPROM_INFO_SERIAL_NUM_SIZE)) - { - /* Read Sensor EEPROM cause change a module */ - info("%s() : Different new module, so read eeprom\n", __func__); + ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); + if (ret) { + err("%s(): eeprom data invalid(%d)\n", __func__, ret); + err("retry to read data from eeprom module and update file\n"); I2C_MUTEX_LOCK(eeprom->i2c_lock); /* I2C read to Sensor EEPROM cal data */ @@ -345,21 +333,7 @@ int fimc_is_eeprom_16885c_get_cal_data(struct v4l2_subdev *subdev) /* CRC check to each section cal data */ ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); - if (ret < 0) - err("%s(): eeprom data invalid(%d)\n", __func__, ret); - - /* Write file to Cal data */ - ret = fimc_is_eeprom_file_write(EEPROM_DATA_PATH, (void *)eeprom->data, EEPROM_DATA_SIZE); - if (ret < 0) { - err("%s(), eeprom file write fail(%d)\n", __func__, ret); - return ret; - } - } else { - info("%s(): Same module and file dump so use file dump data\n", __func__); - - /* CRC check to each section cal data */ - ret = CALL_EEPROMOPS(eeprom, eeprom_check_all_crc, subdev); - if (ret < 0) + if (ret) err("%s(): eeprom data invalid(%d)\n", __func__, ret); } } diff --git a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-device-sensor-peri.h b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-device-sensor-peri.h index e9547b6a2b5b..23df049b39d1 100644 --- a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-device-sensor-peri.h +++ b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-device-sensor-peri.h @@ -202,6 +202,8 @@ struct fimc_is_eeprom { char *data; u32 total_size; + + u32 file_write; }; #define FLASH_LED_CH_MAX (4) -- 2.20.1