From patchwork Mon Oct 18 09:54:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: m7aalton X-Patchwork-Id: 4648 Return-path: Envelope-to: mchehab@pedra Delivery-date: Mon, 18 Oct 2010 10:24:32 -0200 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1P7olU-0001PU-G4 for mchehab@pedra; Mon, 18 Oct 2010 10:24:32 -0200 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Mon, 18 Oct 2010 10:24:32 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1P7mRB-0008QI-UJ; Mon, 18 Oct 2010 09:55:26 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753507Ab0JRJyl (ORCPT + 1 other); Mon, 18 Oct 2010 05:54:41 -0400 Received: from mgw-sa02.nokia.com ([147.243.1.48]:62952 "EHLO mgw-sa02.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753952Ab0JRJyj (ORCPT ); Mon, 18 Oct 2010 05:54:39 -0400 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa02.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id o9I9sPtc010835; Mon, 18 Oct 2010 12:54:25 +0300 Received: from localhost.localdomain ([masi.nmp.nokia.com [172.22.211.19]]) by mgw-sa02.nokia.com with RELAY id o9I9sDdA010508 ; Mon, 18 Oct 2010 12:54:14 +0300 From: "Matti J. Aaltonen" To: linux-media@vger.kernel.org, mchehab@redhat.com, hverkuil@xs4all.nl Cc: "Matti J. Aaltonen" Subject: [PATCH RFC 1/1] V4L2: Use new CAP bits in existing RDS capable drivers. Date: Mon, 18 Oct 2010 12:54:14 +0300 Message-Id: <1287395654-1822-1-git-send-email-matti.j.aaltonen@nokia.com> X-Mailer: git-send-email 1.6.1.3 X-Nokia-AV: Clean Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: Add either V4L2_TUNER_CAP_RDS_BLOCK_IO or V4L2_TUNER_CAP_RDS_CONTROLS bit to tuner or modulator capabilities of existing drivers of devices with RDS capability. Signed-off-by: Matti J. Aaltonen Acked-by: Hans Verkuil --- drivers/media/radio/radio-cadet.c | 3 ++- drivers/media/radio/si470x/radio-si470x-common.c | 2 +- drivers/media/radio/si4713-i2c.c | 2 +- drivers/media/video/saa6588.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c index 482d0f3..b701ea6 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, 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 9927a59..af5ad45 100644 --- a/drivers/media/radio/si470x/radio-si470x-common.c +++ b/drivers/media/radio/si470x/radio-si470x-common.c @@ -681,7 +681,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 fc7f4b7..a6e6f19 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) 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 c3e96f0..eac222b 100644 --- a/drivers/media/video/saa6588.c +++ b/drivers/media/video/saa6588.c @@ -430,7 +430,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;