summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx23885
diff options
context:
space:
mode:
authorBrad Love <brad@nextdimension.cc>2018-03-06 14:14:58 -0500
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2018-03-07 04:00:24 -0500
commit93e5b2066a2741b3b96b5685e6207287909192fa (patch)
treefb0c7f92c8e47be05ac4606210bd93208b8aade5 /drivers/media/pci/cx23885
parentb94e47055bad45a005cc62b07a5fc79bf36e3e96 (diff)
downloadlinux-stable-93e5b2066a2741b3b96b5685e6207287909192fa.tar.gz
linux-stable-93e5b2066a2741b3b96b5685e6207287909192fa.tar.bz2
linux-stable-93e5b2066a2741b3b96b5685e6207287909192fa.zip
media: cx23885: Add tuner type and analog inputs to 1265
Add missing composite and s-video inputs. Signed-off-by: Brad Love <brad@nextdimension.cc> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/cx23885')
-rw-r--r--drivers/media/pci/cx23885/cx23885-cards.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 831b066cdfe1..5a640980f967 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -788,8 +788,24 @@ struct cx23885_board cx23885_boards[] = {
},
[CX23885_BOARD_HAUPPAUGE_HVR1265_K4] = {
.name = "Hauppauge WinTV-HVR-1265(161111)",
+ .porta = CX23885_ANALOG_VIDEO,
.portc = CX23885_MPEG_DVB,
+ .tuner_type = TUNER_ABSENT,
.force_bff = 1,
+ .input = {{
+ .type = CX23885_VMUX_COMPOSITE1,
+ .vmux = CX25840_VIN7_CH3 |
+ CX25840_VIN4_CH2 |
+ CX25840_VIN6_CH1,
+ .amux = CX25840_AUDIO7,
+ }, {
+ .type = CX23885_VMUX_SVIDEO,
+ .vmux = CX25840_VIN7_CH3 |
+ CX25840_VIN4_CH2 |
+ CX25840_VIN8_CH1 |
+ CX25840_SVIDEO_ON,
+ .amux = CX25840_AUDIO7,
+ } },
},
[CX23885_BOARD_HAUPPAUGE_STARBURST2] = {
.name = "Hauppauge WinTV-Starburst2",