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

Commit cb0ed222 authored by Matti Aaltonen's avatar Matti Aaltonen Committed by Mauro Carvalho Chehab
Browse files

[media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent eb8942e9

drivers/media/radio/radio-cadet.c

+2 −1
Original line number Diff line number Diff line
@@ -374,7 +374,8 @@ static int vidioc_g_tuner(struct file *file, void *priv, 
	switch (v->index) {

	case 0:

		strlcpy(v->name, "FM", sizeof(v->name));

		v->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS;

		v->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS |

			V4L2_TUNER_CAP_RDS_BLOCK_IO;

		v->rangelow = 1400;     /* 87.5 MHz */

		v->rangehigh = 1728;    /* 108.0 MHz */

		v->rxsubchans = cadet_getstereo(dev);

drivers/media/radio/si470x/radio-si470x-common.c

+1 −1
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, 
	tuner->type = V4L2_TUNER_RADIO;

#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)

	tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |

			    V4L2_TUNER_CAP_RDS;

			    V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO;

#else

	tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;

#endif

drivers/media/radio/si4713-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -1804,7 +1804,7 @@ static int si4713_g_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm) 


	strncpy(vm->name, "FM Modulator", 32);

	vm->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LOW |

						V4L2_TUNER_CAP_RDS;

		V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_CONTROLS;



	/* Report current frequency range limits */

	vm->rangelow = si4713_to_v4l2(FREQ_RANGE_LOW);

drivers/media/video/saa6588.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int saa6588_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) 
{

	struct saa6588 *s = to_saa6588(sd);



	vt->capability |= V4L2_TUNER_CAP_RDS;

	vt->capability |= V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO;

	if (s->sync)

		vt->rxsubchans |= V4L2_TUNER_SUB_RDS;

	return 0;