Commit 186a21cb authored by Tobias Lorenz's avatar Tobias Lorenz Committed by Mauro Carvalho Chehab

[media] radio-si470x: Always report support for RDS

The si470x i2c and usb driver support the RDS, so this ifdef statement
doesn't need more.

[mchehab@redhat.com: Fix a conflict on it]
Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Acked-by: default avatarTobias Lorenz <tobias.lorenz@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 131ddd1a
...@@ -688,12 +688,8 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, ...@@ -688,12 +688,8 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
/* driver constants */ /* driver constants */
strcpy(tuner->name, "FM"); strcpy(tuner->name, "FM");
tuner->type = V4L2_TUNER_RADIO; 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 | tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO; V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO;
#else
tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;
#endif
/* range limits */ /* range limits */
switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) { switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) {
...@@ -719,12 +715,10 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, ...@@ -719,12 +715,10 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
tuner->rxsubchans = V4L2_TUNER_SUB_MONO; tuner->rxsubchans = V4L2_TUNER_SUB_MONO;
else else
tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)
/* If there is a reliable method of detecting an RDS channel, /* If there is a reliable method of detecting an RDS channel,
then this code should check for that before setting this then this code should check for that before setting this
RDS subchannel. */ RDS subchannel. */
tuner->rxsubchans |= V4L2_TUNER_SUB_RDS; tuner->rxsubchans |= V4L2_TUNER_SUB_RDS;
#endif
/* mono/stereo selector */ /* mono/stereo selector */
if ((radio->registers[POWERCFG] & POWERCFG_MONO) == 0) if ((radio->registers[POWERCFG] & POWERCFG_MONO) == 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment