diff options
author | Mijhail Moreyra <mijhail.moreyra@gmail.com> | 2011-10-10 10:09:53 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-10-14 15:52:35 -0400 |
commit | 18d644767171a13214b01c7edc62105bdaddd66e (patch) | |
tree | 7a4fa2ab5837937058409e2ca58cf648baa4cab0 | |
parent | 9e44d63246a9c884900e56e2aa16fba94dee5f0c (diff) |
[media] cx23885: add definitions for HVR1500 to support audio
Signed-off-by: Mijhail Moreyra <mijhail.moreyra@gmail.com>
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/cx23885/cx23885-cards.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c index 62fd25e7633b..75d77c2db5c9 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c | |||
@@ -153,7 +153,30 @@ struct cx23885_board cx23885_boards[] = { | |||
153 | }, | 153 | }, |
154 | [CX23885_BOARD_HAUPPAUGE_HVR1500] = { | 154 | [CX23885_BOARD_HAUPPAUGE_HVR1500] = { |
155 | .name = "Hauppauge WinTV-HVR1500", | 155 | .name = "Hauppauge WinTV-HVR1500", |
156 | .porta = CX23885_ANALOG_VIDEO, | ||
156 | .portc = CX23885_MPEG_DVB, | 157 | .portc = CX23885_MPEG_DVB, |
158 | .tuner_type = TUNER_XC2028, | ||
159 | .tuner_addr = 0x61, /* 0xc2 >> 1 */ | ||
160 | .input = {{ | ||
161 | .type = CX23885_VMUX_TELEVISION, | ||
162 | .vmux = CX25840_VIN7_CH3 | | ||
163 | CX25840_VIN5_CH2 | | ||
164 | CX25840_VIN2_CH1, | ||
165 | .gpio0 = 0, | ||
166 | }, { | ||
167 | .type = CX23885_VMUX_COMPOSITE1, | ||
168 | .vmux = CX25840_VIN7_CH3 | | ||
169 | CX25840_VIN4_CH2 | | ||
170 | CX25840_VIN6_CH1, | ||
171 | .gpio0 = 0, | ||
172 | }, { | ||
173 | .type = CX23885_VMUX_SVIDEO, | ||
174 | .vmux = CX25840_VIN7_CH3 | | ||
175 | CX25840_VIN4_CH2 | | ||
176 | CX25840_VIN8_CH1 | | ||
177 | CX25840_SVIDEO_ON, | ||
178 | .gpio0 = 0, | ||
179 | } }, | ||
157 | }, | 180 | }, |
158 | [CX23885_BOARD_HAUPPAUGE_HVR1200] = { | 181 | [CX23885_BOARD_HAUPPAUGE_HVR1200] = { |
159 | .name = "Hauppauge WinTV-HVR1200", | 182 | .name = "Hauppauge WinTV-HVR1200", |
@@ -1415,6 +1438,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) | |||
1415 | case CX23885_BOARD_HAUPPAUGE_HVR1290: | 1438 | case CX23885_BOARD_HAUPPAUGE_HVR1290: |
1416 | case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200: | 1439 | case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200: |
1417 | case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID: | 1440 | case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID: |
1441 | case CX23885_BOARD_HAUPPAUGE_HVR1500: | ||
1418 | dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, | 1442 | dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, |
1419 | &dev->i2c_bus[2].i2c_adap, | 1443 | &dev->i2c_bus[2].i2c_adap, |
1420 | "cx25840", 0x88 >> 1, NULL); | 1444 | "cx25840", 0x88 >> 1, NULL); |