summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-01-07 05:20:04 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:04:41 -0200
commit1434bc0cbb842ed71eada244ac46185e3b17e4e2 (patch)
tree9f30173e6693e12c4f99c6f03812f1941d19a1f8
parent616f8878bc5b5b2276f1941643d9ca7c88690305 (diff)
downloadkernel-crypto-1434bc0cbb842ed71eada244ac46185e3b17e4e2.tar.gz
kernel-crypto-1434bc0cbb842ed71eada244ac46185e3b17e4e2.tar.xz
kernel-crypto-1434bc0cbb842ed71eada244ac46185e3b17e4e2.zip
V4L/DVB (6975): Add missing entry for Beholder BeholdTV 407
Acked-by: Andrey J. Melnikov <temnota@kmv.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--Documentation/video4linux/CARDLIST.saa71342
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c27
2 files changed, 28 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 387c35f2ecd..fda570e50fa 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -121,7 +121,7 @@
120 -> Beholder BeholdTV 403 FM [1131:0000,0000:4037]
121 -> Beholder BeholdTV 405 [0000:4050]
122 -> Beholder BeholdTV 405 FM [0000:4051]
-123 -> [0000:4070]
+123 -> Beholder BeholdTV 407 [0000:4070]
124 -> Beholder BeholdTV 407 FM [0000:4071]
125 -> Beholder BeholdTV 409 [0000:4090]
126 -> Beholder BeholdTV 505 FM/RDS [0000:5051,0000:505B,5ace:5050]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 6a35d88fdbb..46b6ac4b310 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3687,6 +3687,33 @@ struct saa7134_board saa7134_boards[] = {
.amux = LINE2,
},
},
+ [SAA7134_BOARD_BEHOLD_407] = {
+ .name = "Beholder BeholdTV 407",
+ .audio_clock = 0x00187de7,
+ .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
+ .radio_type = UNSET,
+ .tuner_addr = ADDR_UNSET,
+ .radio_addr = ADDR_UNSET,
+ .tda9887_conf = TDA9887_PRESENT,
+ .gpiomask = 0xc0c000,
+ .inputs = {{
+ .name = name_svideo,
+ .vmux = 8,
+ .amux = LINE1,
+ .gpio = 0xc0c000,
+ },{
+ .name = name_comp1,
+ .vmux = 1,
+ .amux = LINE1,
+ .gpio = 0xc0c000,
+ },{
+ .name = name_tv,
+ .vmux = 3,
+ .amux = TV,
+ .tv = 1,
+ .gpio = 0xc0c000,
+ }},
+ },
[SAA7134_BOARD_BEHOLD_407FM] = {
.name = "Beholder BeholdTV 407 FM",
.audio_clock = 0x00187de7,