media: ccs: Only do software reset if we have no hardware reset

The driver always used software reset after the sensor's power sequence
that includes a hardware reset if we have a reset GPIO. Do not use
software reset if we just brought the sensor up from hardware reset state.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index da7a6bd2c820b821743b5bd239a13de7a223c14d..fdf2e83eeac3f2deb0bbcf4e249559e191912684 100644 (file)
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -1552,10 +1552,12 @@ static int ccs_power_on(struct device *dev)
         * is found.
         */
 
-       rval = ccs_write(sensor, SOFTWARE_RESET, CCS_SOFTWARE_RESET_ON);
-       if (rval < 0) {
-               dev_err(dev, "software reset failed\n");
-               goto out_cci_addr_fail;
+       if (!sensor->reset && !sensor->xshutdown) {
+               rval = ccs_write(sensor, SOFTWARE_RESET, CCS_SOFTWARE_RESET_ON);
+               if (rval < 0) {
+                       dev_err(dev, "software reset failed\n");
+                       goto out_cci_addr_fail;
+               }
        }
 
        if (sensor->hwcfg.i2c_addr_alt) {