leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: ccs: Combine revision number major and minor into one

Browse Source 
The module revision number major and minor are both 8 bits while the
sensor revision number is 16 bits. Combine the module revision into one
number.

This also adds printing the lowest 8 bits of the module version through
the sysfs attribute.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Sakari Ailus 2020-02-14 14:14:18 +01:00 committed by Mauro Carvalho Chehab
parent a6b396f410
commit f86ae91627
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/media/i2c/ccs/ccs-core.c
View File

@ -2427,11 +2427,11 @@ ccs_sysfs_ident_read(struct device *dev, struct device_attribute *attr,
if (minfo->mipi_manufacturer_id) if (minfo->mipi_manufacturer_id)
return snprintf(buf, PAGE_SIZE, "%4.4x%4.4x%2.2x\n", return snprintf(buf, PAGE_SIZE, "%4.4x%4.4x%2.2x\n",
minfo->mipi_manufacturer_id, minfo->model_id, minfo->mipi_manufacturer_id, minfo->model_id,
minfo->revision_number_major) + 1; minfo->revision_number) + 1;
else else
return snprintf(buf, PAGE_SIZE, "%2.2x%4.4x%2.2x\n", return snprintf(buf, PAGE_SIZE, "%2.2x%4.4x%2.2x\n",
minfo->smia_manufacturer_id, minfo->model_id, minfo->smia_manufacturer_id, minfo->model_id,
minfo->revision_number_major) + 1; minfo->revision_number) + 1;
} }
static DEVICE_ATTR(ident, S_IRUGO, ccs_sysfs_ident_read, NULL); static DEVICE_ATTR(ident, S_IRUGO, ccs_sysfs_ident_read, NULL);
@ -2445,6 +2445,7 @@ static int ccs_identify_module(struct ccs_sensor *sensor)
struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd); struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
struct ccs_module_info *minfo = &sensor->minfo; struct ccs_module_info *minfo = &sensor->minfo;
unsigned int i; unsigned int i;
u32 rev;
int rval = 0; int rval = 0;
/* Module info */ /* Module info */
@ -2460,11 +2461,13 @@ static int ccs_identify_module(struct ccs_sensor *sensor)
if (!rval) if (!rval)
rval = ccs_read_addr_8only(sensor, rval = ccs_read_addr_8only(sensor,
CCS_R_MODULE_REVISION_NUMBER_MAJOR, CCS_R_MODULE_REVISION_NUMBER_MAJOR,
&minfo->revision_number_major); &rev);
if (!rval) if (!rval) {
rval = ccs_read_addr_8only(sensor, rval = ccs_read_addr_8only(sensor,
CCS_R_MODULE_REVISION_NUMBER_MINOR, CCS_R_MODULE_REVISION_NUMBER_MINOR,
&minfo->revision_number_minor); &minfo->revision_number);
minfo->revision_number |= rev << 8;
}
if (!rval) if (!rval)
rval = ccs_read_addr_8only(sensor, CCS_R_MODULE_DATE_YEAR, rval = ccs_read_addr_8only(sensor, CCS_R_MODULE_DATE_YEAR,
&minfo->module_year); &minfo->module_year);
@ -2519,9 +2522,9 @@ static int ccs_identify_module(struct ccs_sensor *sensor)
minfo->smia_manufacturer_id, minfo->model_id); minfo->smia_manufacturer_id, minfo->model_id);
dev_dbg(&client->dev, dev_dbg(&client->dev,
"module revision 0x%2.2x-0x%2.2x date %2.2d-%2.2d-%2.2d\n", "module revision 0x%4.4x date %2.2d-%2.2d-%2.2d\n",
minfo->revision_number_major, minfo->revision_number_minor, minfo->revision_number, minfo->module_year, minfo->module_month,
minfo->module_year, minfo->module_month, minfo->module_day); minfo->module_day);
if (minfo->sensor_mipi_manufacturer_id) if (minfo->sensor_mipi_manufacturer_id)
dev_dbg(&client->dev, "MIPI CCS sensor 0x%4.4x-0x%4.4x\n", dev_dbg(&client->dev, "MIPI CCS sensor 0x%4.4x-0x%4.4x\n",
@ -2559,7 +2562,7 @@ static int ccs_identify_module(struct ccs_sensor *sensor)
minfo->smia_manufacturer_id = minfo->smia_manufacturer_id =
minfo->sensor_smia_manufacturer_id; minfo->sensor_smia_manufacturer_id;
minfo->model_id = minfo->sensor_model_id; minfo->model_id = minfo->sensor_model_id;
minfo->revision_number_major = minfo->sensor_revision_number; minfo->revision_number = minfo->sensor_revision_number;
} }
for (i = 0; i < ARRAY_SIZE(ccs_module_idents); i++) { for (i = 0; i < ARRAY_SIZE(ccs_module_idents); i++) {
@ -2576,11 +2579,11 @@ static int ccs_identify_module(struct ccs_sensor *sensor)
if (ccs_module_idents[i].flags if (ccs_module_idents[i].flags
& CCS_MODULE_IDENT_FLAG_REV_LE) { & CCS_MODULE_IDENT_FLAG_REV_LE) {
if (ccs_module_idents[i].revision_number_major if (ccs_module_idents[i].revision_number_major
< minfo->revision_number_major) < (minfo->revision_number >> 8))
continue; continue;
} else { } else {
if (ccs_module_idents[i].revision_number_major if (ccs_module_idents[i].revision_number_major
!= minfo->revision_number_major) != (minfo->revision_number >> 8))
continue; continue;
} }

2
drivers/media/i2c/ccs/ccs-quirk.c
View File

@ -35,7 +35,7 @@ static int ccs_write_addr_8s(struct ccs_sensor *sensor,
static int jt8ew9_limits(struct ccs_sensor *sensor) static int jt8ew9_limits(struct ccs_sensor *sensor)
{ {
if (sensor->minfo.revision_number_major < 0x03) if (sensor->minfo.revision_number < 0x0300)
sensor->frame_skip = 1; sensor->frame_skip = 1;
/* Below 24 gain doesn't have effect at all, */ /* Below 24 gain doesn't have effect at all, */

3
drivers/media/i2c/ccs/ccs.h
View File

@ -107,8 +107,7 @@ struct ccs_module_info {
u32 smia_manufacturer_id; u32 smia_manufacturer_id;
u32 mipi_manufacturer_id; u32 mipi_manufacturer_id;
u32 model_id; u32 model_id;
u32 revision_number_major; u32 revision_number;
u32 revision_number_minor;
u32 module_year; u32 module_year;
u32 module_month; u32 module_month;