Commit 5a4e1b5a authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Hans Verkuil
Browse files

media: ov8856: Do not check for for module version 



It the device is probed in non-zero ACPI D state, the module
identification is delayed until the first streamon.

The module identification has two parts: deviceID and version. To rea
the version we have to enable OTP read. This cannot be done during
streamon, becase it modifies REG_MODE_SELECT.

Since the driver has the same behaviour for all the module versions, do
not read the module version from the sensor's OTP.

Cc: stable@vger.kernel.org
Fixes: 0e014f1a ("media: ov8856: support device probe in non-zero ACPI D state")
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent ab190665

drivers/media/i2c/ov8856.c

+0 −40
Original line number Diff line number Diff line
@@ -1709,46 +1709,6 @@ static int ov8856_identify_module(struct ov8856 *ov8856) 
		return -ENXIO;

	}



	ret = ov8856_write_reg(ov8856, OV8856_REG_MODE_SELECT,

			       OV8856_REG_VALUE_08BIT, OV8856_MODE_STREAMING);

	if (ret)

		return ret;



	ret = ov8856_write_reg(ov8856, OV8856_OTP_MODE_CTRL,

			       OV8856_REG_VALUE_08BIT, OV8856_OTP_MODE_AUTO);

	if (ret) {

		dev_err(&client->dev, "failed to set otp mode");

		return ret;

	}



	ret = ov8856_write_reg(ov8856, OV8856_OTP_LOAD_CTRL,

			       OV8856_REG_VALUE_08BIT,

			       OV8856_OTP_LOAD_CTRL_ENABLE);

	if (ret) {

		dev_err(&client->dev, "failed to enable load control");

		return ret;

	}



	ret = ov8856_read_reg(ov8856, OV8856_MODULE_REVISION,

			      OV8856_REG_VALUE_08BIT, &val);

	if (ret) {

		dev_err(&client->dev, "failed to read module revision");

		return ret;

	}



	dev_info(&client->dev, "OV8856 revision %x (%s) at address 0x%02x\n",

		 val,

		 val == OV8856_2A_MODULE ? "2A" :

		 val == OV8856_1B_MODULE ? "1B" : "unknown revision",

		 client->addr);



	ret = ov8856_write_reg(ov8856, OV8856_REG_MODE_SELECT,

			       OV8856_REG_VALUE_08BIT, OV8856_MODE_STANDBY);

	if (ret) {

		dev_err(&client->dev, "failed to exit streaming mode");

		return ret;

	}



	ov8856->identified = true;



	return 0;