aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-12-04 08:31:35 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 09:05:51 -0200
commitcefccc8011c58b559498396f0ccefa0a0ffa3f53 (patch)
treeea31f846a74757ea42ec407efcd724eff05b9e38
parent3086d6cb0a2ec93f17bc215af3113c54af6080c1 (diff)
V4L/DVB (4934): Usbvision radio requires GainNormal at e register
Adds an option to select GainNormal at tda9887 and make usbvision to use it. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/tda9887.c6
-rw-r--r--drivers/media/video/usbvision/usbvision-core.c3
-rw-r--r--include/media/tuner.h1
3 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 87ffb0e84a7..fde576f1101 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -482,6 +482,12 @@ static int tda9887_set_config(struct tuner *t, char *buf)
buf[1] &= ~cQSS;
if (t->tda9887_config & TDA9887_GATING_18)
buf[3] &= ~cGating_36;
+
+ if (t->tda9887_config & TDA9887_GAIN_NORMAL) {
+ radio_stereo.e &= ~cTunerGainLow;
+ radio_mono.e &= ~cTunerGainLow;
+ }
+
return 0;
}
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 0365c7f9397..b5aa3185402 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -2585,12 +2585,15 @@ static int attach_inform(struct i2c_client *client)
case 0x4b:
{
struct tuner_setup tun_setup;
+ unsigned int tda9887_conf = TDA9887_GAIN_NORMAL;
tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
tun_setup.type = TUNER_TDA9887;
tun_setup.addr = client->addr;
call_i2c_clients(usbvision, TUNER_SET_TYPE_ADDR, &tun_setup);
+ call_i2c_clients(usbvision,TDA9887_SET_CONFIG, &tda9887_conf);
+
break;
}
case 0x42:
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 3116e750132..99acf847365 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -145,6 +145,7 @@ extern int tuner_debug;
#define TDA9887_DEEMPHASIS_75 (3<<16)
#define TDA9887_AUTOMUTE (1<<18)
#define TDA9887_GATING_18 (1<<19)
+#define TDA9887_GAIN_NORMAL (1<<20)
#ifdef __KERNEL__