Commit c31d11e3 authored by Sakari Ailus's avatar Sakari Ailus Committed by Hans Verkuil
Browse files

media: ccs: Apply module manufacturer hack on non-CCS devices only 



Some modules don't have any model identification information in the
register address space. The driver as a SMIA++ driver attempted to use
sensor information in this case. This workaround is definitely not for CCS
devices.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 2bef6337

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

+12 −13
Original line number Diff line number Diff line
@@ -2894,8 +2894,6 @@ static int ccs_identify_module(struct ccs_sensor *sensor) 
			"smia version %2.2d smiapp version %2.2d\n",

			minfo->smia_version, minfo->smiapp_version);

		minfo->name = SMIAPP_NAME;

	}



		/*

		 * Some modules have bad data in the lvalues below. Hope the

		 * rvalues have better stuff. The lvalues are module
@@ -2908,6 +2906,7 @@ static int ccs_identify_module(struct ccs_sensor *sensor) 
			minfo->model_id = minfo->sensor_model_id;

			minfo->revision_number = minfo->sensor_revision_number;

		}

	}



	for (i = 0; i < ARRAY_SIZE(ccs_module_idents); i++) {

		if (ccs_module_idents[i].mipi_manufacturer_id &&