aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 387c35f2ecd7..fda570e50fa8 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -121,7 +121,7 @@
121120 -> Beholder BeholdTV 403 FM [1131:0000,0000:4037] 121120 -> Beholder BeholdTV 403 FM [1131:0000,0000:4037]
122121 -> Beholder BeholdTV 405 [0000:4050] 122121 -> Beholder BeholdTV 405 [0000:4050]
123122 -> Beholder BeholdTV 405 FM [0000:4051] 123122 -> Beholder BeholdTV 405 FM [0000:4051]
124123 -> [0000:4070] 124123 -> Beholder BeholdTV 407 [0000:4070]
125124 -> Beholder BeholdTV 407 FM [0000:4071] 125124 -> Beholder BeholdTV 407 FM [0000:4071]
126125 -> Beholder BeholdTV 409 [0000:4090] 126125 -> Beholder BeholdTV 409 [0000:4090]
127126 -> Beholder BeholdTV 505 FM/RDS [0000:5051,0000:505B,5ace:5050] 127126 -> 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 6a35d88fdbb2..46b6ac4b3105 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[] = {
3687 .amux = LINE2, 3687 .amux = LINE2,
3688 }, 3688 },
3689 }, 3689 },
3690 [SAA7134_BOARD_BEHOLD_407] = {
3691 .name = "Beholder BeholdTV 407",
3692 .audio_clock = 0x00187de7,
3693 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
3694 .radio_type = UNSET,
3695 .tuner_addr = ADDR_UNSET,
3696 .radio_addr = ADDR_UNSET,
3697 .tda9887_conf = TDA9887_PRESENT,
3698 .gpiomask = 0xc0c000,
3699 .inputs = {{
3700 .name = name_svideo,
3701 .vmux = 8,
3702 .amux = LINE1,
3703 .gpio = 0xc0c000,
3704 },{
3705 .name = name_comp1,
3706 .vmux = 1,
3707 .amux = LINE1,
3708 .gpio = 0xc0c000,
3709 },{
3710 .name = name_tv,
3711 .vmux = 3,
3712 .amux = TV,
3713 .tv = 1,
3714 .gpio = 0xc0c000,
3715 }},
3716 },
3690 [SAA7134_BOARD_BEHOLD_407FM] = { 3717 [SAA7134_BOARD_BEHOLD_407FM] = {
3691 .name = "Beholder BeholdTV 407 FM", 3718 .name = "Beholder BeholdTV 407 FM",
3692 .audio_clock = 0x00187de7, 3719 .audio_clock = 0x00187de7,