media: ccs: Support 16-bit sensor revision number register

Read 16-bit sensor revision number if the 8-bit register has value 0.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index daee36c1f545be3fb4cde22632d71a32fa9dce4b..4adb2da34066177733a97f58faa746ae2b073bc0 100644 (file)
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -2834,6 +2834,10 @@ static int ccs_identify_module(struct ccs_sensor *sensor)
                rval = ccs_read_addr_8only(sensor,
                                           CCS_R_SENSOR_REVISION_NUMBER,
                                           &minfo->sensor_revision_number);
+       if (!rval && !minfo->sensor_revision_number)
+               rval = ccs_read_addr_8only(sensor,
+                                          CCS_R_SENSOR_REVISION_NUMBER_16,
+                                          &minfo->sensor_revision_number);
        if (!rval)
                rval = ccs_read_addr_8only(sensor,
                                           CCS_R_SENSOR_FIRMWARE_VERSION,
@@ -2876,7 +2880,7 @@ static int ccs_identify_module(struct ccs_sensor *sensor)
                        minfo->sensor_model_id);
 
        dev_dbg(&client->dev,
-               "sensor revision 0x%2.2x firmware version 0x%2.2x\n",
+               "sensor revision 0x%4.4x firmware version 0x%2.2x\n",
                minfo->sensor_revision_number, minfo->sensor_firmware_version);
 
        if (minfo->ccs_version) {