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

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 482d0f3be5ffe7a26ed931a1c7f44042a384da9c..b701ea6e7c7379fc0593fae6c22c4678152cd4e7 100644 (file)
--- 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,
        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);

diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index 61be9887e6a10d4f525c6a8242a60b960cd5c500..ac76dfe5b3fa09347c389950e6cf95e496f17441 100644 (file)
--- 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,
        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

diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index fc7f4b7946498be041778d70486d0a2b721ac7d2..a6e6f1987a3a42a1c68c35f317a59a5d56677040 100644 (file)
--- 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)
 
        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);

diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 2ddd68cc3f93014d7efe295c7b2794b6fa44429e..984c0feb2a4ebb87d1f399d7888c7261ed4c0bfe 100644 (file)
--- 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)
 {
        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;