aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885-cards.c
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2007-08-22 20:01:20 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:08:20 -0400
commita77743bc2d29197d48a6f4ae9f8f9e0f0b0ba5d7 (patch)
tree54297211d81fe39bcfab7be65a2ff92339072eda /drivers/media/video/cx23885/cx23885-cards.c
parent4823e9ee9f45c78777d040742b5e46336a42c8b3 (diff)
V4L/DVB (6168): cx23885: Added HVR1250 ATSC support
Adding support for the Hauppauge HVR1250 PCIe ATSC board. Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-cards.c')
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 8bb3fe4a876c..e6d34fb5b943 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -88,6 +88,27 @@ struct cx23885_board cx23885_boards[] = {
88 .gpio0 = 0xff02, 88 .gpio0 = 0xff02,
89 }}, 89 }},
90 }, 90 },
91 [CX23885_BOARD_HAUPPAUGE_HVR1250] = {
92 .name = "Hauppauge WinTV-HVR1250",
93 .portc = CX23885_MPEG_DVB,
94 .input = {{
95 .type = CX23885_VMUX_TELEVISION,
96 .vmux = 0,
97 .gpio0 = 0xff00,
98 },{
99 .type = CX23885_VMUX_DEBUG,
100 .vmux = 0,
101 .gpio0 = 0xff01,
102 },{
103 .type = CX23885_VMUX_COMPOSITE1,
104 .vmux = 1,
105 .gpio0 = 0xff02,
106 },{
107 .type = CX23885_VMUX_SVIDEO,
108 .vmux = 2,
109 .gpio0 = 0xff02,
110 }},
111 },
91}; 112};
92const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards); 113const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
93 114
@@ -111,6 +132,10 @@ struct cx23885_subid cx23885_subids[] = {
111 .subvendor = 0x0070, 132 .subvendor = 0x0070,
112 .subdevice = 0x7801, 133 .subdevice = 0x7801,
113 .card = CX23885_BOARD_HAUPPAUGE_HVR1800, 134 .card = CX23885_BOARD_HAUPPAUGE_HVR1800,
135 },{
136 .subvendor = 0x0070,
137 .subdevice = 0x7911,
138 .card = CX23885_BOARD_HAUPPAUGE_HVR1250,
114 }, 139 },
115}; 140};
116const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids); 141const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -176,6 +201,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
176 } 201 }
177 202
178 switch (dev->board) { 203 switch (dev->board) {
204 case CX23885_BOARD_HAUPPAUGE_HVR1250:
179 case CX23885_BOARD_HAUPPAUGE_HVR1800: 205 case CX23885_BOARD_HAUPPAUGE_HVR1800:
180 case CX23885_BOARD_HAUPPAUGE_HVR1800lp: 206 case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
181 if (dev->i2c_bus[0].i2c_rc == 0) 207 if (dev->i2c_bus[0].i2c_rc == 0)