Commit 63575dd3 authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Mauro Carvalho Chehab
Browse files

media: i2c: imx412: Assign v4l2 device subname based on compat string 

imx412 and imx577 return the same chip-id when interrogated via i2c.
I've confirmed this myself by

Sakari suggested we should add a new compat which should be reflected in
the name of the media entity

https://patchwork.kernel.org/project/linux-media/patch/20220607134057.2427663-3-bryan.odonoghue@linaro.org/#24894500



Set up the .data parameter of of_device_id to pass a string which
we use to set the media entity name. Once done we can add in imx577 as a
compatible chips with the media names reflecting the directed compat string.

Cc: sakari.ailus@iki.fi
Cc: dave.stevenson@raspberrypi.com
Cc: jacopo@jmondi.org
Cc: "Paul J. Murphy" <paul.j.murphy@intel.com>
Cc: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent fd1c9499

drivers/media/i2c/imx412.c

+7 −1
Original line number Diff line number Diff line
@@ -1172,6 +1172,7 @@ static int imx412_init_controls(struct imx412 *imx412) 
static int imx412_probe(struct i2c_client *client)

{

	struct imx412 *imx412;

	const char *name;

	int ret;



	imx412 = devm_kzalloc(&client->dev, sizeof(*imx412), GFP_KERNEL);
@@ -1179,6 +1180,9 @@ static int imx412_probe(struct i2c_client *client) 
		return -ENOMEM;



	imx412->dev = &client->dev;

	name = device_get_match_data(&client->dev);

	if (!name)

		return -ENODEV;



	/* Initialize subdev */

	v4l2_i2c_subdev_init(&imx412->sd, client, &imx412_subdev_ops);
@@ -1218,6 +1222,8 @@ static int imx412_probe(struct i2c_client *client) 
	imx412->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

	imx412->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;



	v4l2_i2c_subdev_set_name(&imx412->sd, client, name, NULL);



	/* Initialize source pad */

	imx412->pad.flags = MEDIA_PAD_FL_SOURCE;

	ret = media_entity_pads_init(&imx412->sd.entity, 1, &imx412->pad);
@@ -1279,7 +1285,7 @@ static const struct dev_pm_ops imx412_pm_ops = { 
};



static const struct of_device_id imx412_of_match[] = {

	{ .compatible = "sony,imx412" },

	{ .compatible = "sony,imx412", .data = "imx412" },

	{ }

};