Commit e1988e7a authored Oct 08, 2020 by Sakari Ailus Committed by Mauro Carvalho Chehab Jan 12, 2021

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>

parent 105676ce

drivers/media/i2c/ccs/ccs-core.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -1552,11 +1552,13 @@ static int ccs_power_on(struct device *dev)
		* is found.
		*/

		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) {
		rval = ccs_change_cci_addr(sensor);