aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@yandex.ru>2005-11-08 21:37:39 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:19 -0800
commit3ae1adc6ed93d55a27523f395284940fbe056401 (patch)
tree8e8ccbed3d907c82b27154ff73d701d5f1782f14
parent71633c05724d85f1afb87629bb96fdf2ef18b41f (diff)
[PATCH] v4l: 795: new config option for tda9887 to specifically set intercarrier
- New config option for tda9887 to specifically set intercarrier Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/media/video/cx88/cx88-cards.c2
-rw-r--r--drivers/media/video/tda9887.c2
-rw-r--r--include/media/tuner.h1
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 6a85ba111fb..cf17da83691 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -206,7 +206,7 @@ struct cx88_board cx88_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
- .tda9887_conf = TDA9887_PRESENT,
+ .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER_NTSC,
.input = {{
.type = CX88_VMUX_TELEVISION,
.vmux = 0,
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 3a7babef06f..796110d4ff7 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -464,6 +464,8 @@ static int tda9887_set_config(struct tda9887 *t, char *buf)
break;
}
}
+ if ((t->config & TDA9887_INTERCARRIER_NTSC) && (t->std & V4L2_STD_NTSC))
+ buf[1] &= ~cQSS;
return 0;
}
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 7cc74b1bb6e..81025323267 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -148,6 +148,7 @@
# define TDA9887_INTERCARRIER (1<<4)
# define TDA9887_PORT1_ACTIVE (1<<5)
# define TDA9887_PORT2_ACTIVE (1<<6)
+# define TDA9887_INTERCARRIER_NTSC (1<<7)
/* config options */
# define TDA9887_DEEMPHASIS_MASK (3<<16)
# define TDA9887_DEEMPHASIS_NONE (1<<16)