Commit e1988e7a authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab

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: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 105676ce
...@@ -1552,10 +1552,12 @@ static int ccs_power_on(struct device *dev) ...@@ -1552,10 +1552,12 @@ static int ccs_power_on(struct device *dev)
* is found. * is found.
*/ */
rval = ccs_write(sensor, SOFTWARE_RESET, CCS_SOFTWARE_RESET_ON); if (!sensor->reset && !sensor->xshutdown) {
if (rval < 0) { rval = ccs_write(sensor, SOFTWARE_RESET, CCS_SOFTWARE_RESET_ON);
dev_err(dev, "software reset failed\n"); if (rval < 0) {
goto out_cci_addr_fail; dev_err(dev, "software reset failed\n");
goto out_cci_addr_fail;
}
} }
if (sensor->hwcfg.i2c_addr_alt) { if (sensor->hwcfg.i2c_addr_alt) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment