redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] rcar-vin: add dependency on MEDIA_CONTROLLER

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

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Niklas Söderlund 2016-08-15 12:06:32 -03:00 committed by Mauro Carvalho Chehab
parent 64663531a4
commit 2fb5910c03
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/platform/rcar-vin/Kconfig
View file

@ -1,6 +1,6 @@
config VIDEO_RCAR_VIN config VIDEO_RCAR_VIN
tristate "R-Car Video Input (VIN) Driver" 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 depends on ARCH_RENESAS || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_DMA_CONTIG
---help--- ---help---

7
drivers/media/platform/rcar-vin/rcar-v4l2.c
View file

@ -771,10 +771,7 @@ int rvin_v4l2_probe(struct rvin_dev *vin)
struct v4l2_mbus_framefmt *mf = &fmt.format; struct v4l2_mbus_framefmt *mf = &fmt.format;
struct video_device *vdev = &vin->vdev; struct video_device *vdev = &vin->vdev;
struct v4l2_subdev *sd = vin_to_source(vin); struct v4l2_subdev *sd = vin_to_source(vin);
#if defined(CONFIG_MEDIA_CONTROLLER) int pad_idx, ret;
int pad_idx;
#endif
int ret;
v4l2_set_subdev_hostdata(sd, vin); v4l2_set_subdev_hostdata(sd, vin);
@ -821,7 +818,6 @@ int rvin_v4l2_probe(struct rvin_dev *vin)
V4L2_CAP_READWRITE; V4L2_CAP_READWRITE;
vin->src_pad_idx = 0; vin->src_pad_idx = 0;
#if defined(CONFIG_MEDIA_CONTROLLER)
for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++) for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++)
if (sd->entity.pads[pad_idx].flags == MEDIA_PAD_FL_SOURCE) if (sd->entity.pads[pad_idx].flags == MEDIA_PAD_FL_SOURCE)
break; break;
@ -829,7 +825,6 @@ int rvin_v4l2_probe(struct rvin_dev *vin)
return -EINVAL; return -EINVAL;
vin->src_pad_idx = pad_idx; vin->src_pad_idx = pad_idx;
#endif
fmt.pad = vin->src_pad_idx; fmt.pad = vin->src_pad_idx;
/* Try to improve our guess of a reasonable window format */ /* Try to improve our guess of a reasonable window format */