aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMatti Aaltonen <matti.j.aaltonen@nokia.com>2010-10-18 05:54:14 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-22 21:49:47 -0400
commitcb0ed22270129b980257fa9c83b152f09ecd9eda (patch)
treeb8fff62d7802a2ef4653227a989346b2b0dbb7bb /drivers/media
parenteb8942e9b6150d3cc89640f1fb243ca9626a1d14 (diff)
[media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/radio/radio-cadet.c3
-rw-r--r--drivers/media/radio/si470x/radio-si470x-common.c2
-rw-r--r--drivers/media/radio/si4713-i2c.c2
-rw-r--r--drivers/media/video/saa6588.c2
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 482d0f3be5ff..b701ea6e7c73 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -374,7 +374,8 @@ static int vidioc_g_tuner(struct file *file, void *priv,
374 switch (v->index) { 374 switch (v->index) {
375 case 0: 375 case 0:
376 strlcpy(v->name, "FM", sizeof(v->name)); 376 strlcpy(v->name, "FM", sizeof(v->name));
377 v->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS; 377 v->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS |
378 V4L2_TUNER_CAP_RDS_BLOCK_IO;
378 v->rangelow = 1400; /* 87.5 MHz */ 379 v->rangelow = 1400; /* 87.5 MHz */
379 v->rangehigh = 1728; /* 108.0 MHz */ 380 v->rangehigh = 1728; /* 108.0 MHz */
380 v->rxsubchans = cadet_getstereo(dev); 381 v->rxsubchans = cadet_getstereo(dev);
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index 61be9887e6a1..ac76dfe5b3fa 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -689,7 +689,7 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
689 tuner->type = V4L2_TUNER_RADIO; 689 tuner->type = V4L2_TUNER_RADIO;
690#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE) 690#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)
691 tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO | 691 tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
692 V4L2_TUNER_CAP_RDS; 692 V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO;
693#else 693#else
694 tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO; 694 tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;
695#endif 695#endif
diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index fc7f4b794649..a6e6f1987a3a 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -1804,7 +1804,7 @@ static int si4713_g_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)
1804 1804
1805 strncpy(vm->name, "FM Modulator", 32); 1805 strncpy(vm->name, "FM Modulator", 32);
1806 vm->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LOW | 1806 vm->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LOW |
1807 V4L2_TUNER_CAP_RDS; 1807 V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_CONTROLS;
1808 1808
1809 /* Report current frequency range limits */ 1809 /* Report current frequency range limits */
1810 vm->rangelow = si4713_to_v4l2(FREQ_RANGE_LOW); 1810 vm->rangelow = si4713_to_v4l2(FREQ_RANGE_LOW);
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 2ddd68cc3f93..984c0feb2a4e 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -429,7 +429,7 @@ static int saa6588_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
429{ 429{
430 struct saa6588 *s = to_saa6588(sd); 430 struct saa6588 *s = to_saa6588(sd);
431 431
432 vt->capability |= V4L2_TUNER_CAP_RDS; 432 vt->capability |= V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO;
433 if (s->sync) 433 if (s->sync)
434 vt->rxsubchans |= V4L2_TUNER_SUB_RDS; 434 vt->rxsubchans |= V4L2_TUNER_SUB_RDS;
435 return 0; 435 return 0;