Commit 5be7f8c9 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: staging: media: imx: imx7-mipi-csis: Make subdev name unique 



When multiple CSIS instances are present in a single graph, they are
currently all named "imx7-mipi-csis.0", which breaks the entity name
uniqueness requirement. Fix it by using the device name to create the
subdev name.

Fixes: 7807063b ("media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7")
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Tested-by: Jerome Brunet <jbrunet@baylibre.com> # On i.MX8MP
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 385031b6

drivers/staging/media/imx/imx7-mipi-csis.c

+2 −4
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <media/v4l2-subdev.h>



#define CSIS_DRIVER_NAME			"imx7-mipi-csis"

#define CSIS_SUBDEV_NAME			CSIS_DRIVER_NAME



#define CSIS_PAD_SINK				0

#define CSIS_PAD_SOURCE				1
@@ -313,7 +312,6 @@ struct csi_state { 
	struct reset_control *mrst;

	struct regulator *mipi_phy_regulator;

	const struct mipi_csis_info *info;

	u8 index;



	struct v4l2_subdev sd;

	struct media_pad pads[CSIS_PADS_NUM];
@@ -1329,8 +1327,8 @@ static int mipi_csis_subdev_init(struct csi_state *state) 


	v4l2_subdev_init(sd, &mipi_csis_subdev_ops);

	sd->owner = THIS_MODULE;

	snprintf(sd->name, sizeof(sd->name), "%s.%d",

		 CSIS_SUBDEV_NAME, state->index);

	snprintf(sd->name, sizeof(sd->name), "csis-%s",

		 dev_name(state->dev));



	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

	sd->ctrl_handler = NULL;