Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fb5910c authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Mauro Carvalho Chehab
Browse files

[media] rcar-vin: add dependency on MEDIA_CONTROLLER 



This is done in preparation for Gen3 support where media controller
support will be mandatory for the driver.

Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 64663531

drivers/media/platform/rcar-vin/Kconfig

+1 −1
Original line number Diff line number Diff line 
config VIDEO_RCAR_VIN

	tristate "R-Car Video Input (VIN) Driver"

	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF && HAS_DMA

	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF && HAS_DMA && MEDIA_CONTROLLER

	depends on ARCH_RENESAS || COMPILE_TEST

	select VIDEOBUF2_DMA_CONTIG

	---help---

drivers/media/platform/rcar-vin/rcar-v4l2.c

+1 −6
Original line number Diff line number Diff line
@@ -771,10 +771,7 @@ int rvin_v4l2_probe(struct rvin_dev *vin) 
	struct v4l2_mbus_framefmt *mf = &fmt.format;

	struct video_device *vdev = &vin->vdev;

	struct v4l2_subdev *sd = vin_to_source(vin);

#if defined(CONFIG_MEDIA_CONTROLLER)

	int pad_idx;

#endif

	int ret;

	int pad_idx, ret;



	v4l2_set_subdev_hostdata(sd, vin);
@@ -821,7 +818,6 @@ int rvin_v4l2_probe(struct rvin_dev *vin) 
		V4L2_CAP_READWRITE;



	vin->src_pad_idx = 0;

#if defined(CONFIG_MEDIA_CONTROLLER)

	for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++)

		if (sd->entity.pads[pad_idx].flags == MEDIA_PAD_FL_SOURCE)

			break;
@@ -829,7 +825,6 @@ int rvin_v4l2_probe(struct rvin_dev *vin) 
		return -EINVAL;



	vin->src_pad_idx = pad_idx;

#endif

	fmt.pad = vin->src_pad_idx;



	/* Try to improve our guess of a reasonable window format */