Call CCS compliant sensors as "ccs" instead of "smiapp" in absence of a
device specific name. This is done based on the value of the manufacturer
ID register that is only present in CCS.
Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
---
drivers/media/i2c/smiapp/ccs-core.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/media/i2c/smiapp/ccs-core.c b/drivers/media/i2c/smiapp/ccs-core.c
index f9dbf1407a33..30c4d8edce9d 100644
--- a/drivers/media/i2c/smiapp/ccs-core.c
+++ b/drivers/media/i2c/smiapp/ccs-core.c
@@ -2437,8 +2437,6 @@ static int ccs_identify_module(struct ccs_sensor *sensor)
unsigned int i;
int rval = 0;
- minfo->name = SMIAPP_NAME;
-
/* Module info */
rval = ccs_read(sensor, MODULE_MANUFACTURER_ID,
&minfo->mipi_manufacturer_id);
@@ -2528,15 +2526,18 @@ static int ccs_identify_module(struct ccs_sensor *sensor)
"sensor revision 0x%2.2x firmware version 0x%2.2x\n",
minfo->sensor_revision_number, minfo->sensor_firmware_version);
- if (minfo->ccs_version)
+ if (minfo->ccs_version) {
dev_dbg(&client->dev, "MIPI CCS version %u.%u",
(minfo->ccs_version & CCS_MIPI_CCS_VERSION_MAJOR_MASK)
>> CCS_MIPI_CCS_VERSION_MAJOR_SHIFT,
(minfo->ccs_version & CCS_MIPI_CCS_VERSION_MINOR_MASK));
- else
+ minfo->name = CCS_NAME;
+ } else {
dev_dbg(&client->dev,
"smia version %2.2d smiapp version %2.2d\n",
minfo->smia_version, minfo->smiapp_version);
+ minfo->name = SMIAPP_NAME;
+ }
/*
* Some modules have bad data in the lvalues below. Hope the
--
2.27.0
