aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorJuan Jesús García de Soria Lucena <skandalfo@gmail.com>2009-03-28 22:36:18 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:43:49 -0400
commit80801da83389b2c6e55e1f8f5d17f923ce54f7c8 (patch)
treec216af1266e13784d00ad71328880b12e29687c8 /drivers/media/dvb
parentdb6cbc8cf2fa699a876e4f76ef069b9a2861900a (diff)
V4L/DVB (11328): Add AVerMedia A310 USB IDs to CE6230 driver.
The CE6230 DVB USB driver works correctly for the AVerMedia A310 USB2.0 DVB-T tuner. Add the required USB ID's and hardware names so that the driver will handle it. Signed-off-by: Juan Jesús García de Soria Lucena <skandalfo@gmail.com> Acked-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/dvb-usb/ce6230.c8
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/ce6230.c b/drivers/media/dvb/dvb-usb/ce6230.c
index 5862820f109f..52badc00e673 100644
--- a/drivers/media/dvb/dvb-usb/ce6230.c
+++ b/drivers/media/dvb/dvb-usb/ce6230.c
@@ -250,6 +250,7 @@ static int ce6230_probe(struct usb_interface *intf,
250 250
251static struct usb_device_id ce6230_table[] = { 251static struct usb_device_id ce6230_table[] = {
252 { USB_DEVICE(USB_VID_INTEL, USB_PID_INTEL_CE9500) }, 252 { USB_DEVICE(USB_VID_INTEL, USB_PID_INTEL_CE9500) },
253 { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A310) },
253 { } /* Terminating entry */ 254 { } /* Terminating entry */
254}; 255};
255MODULE_DEVICE_TABLE(usb, ce6230_table); 256MODULE_DEVICE_TABLE(usb, ce6230_table);
@@ -284,13 +285,18 @@ static struct dvb_usb_device_properties ce6230_properties = {
284 285
285 .i2c_algo = &ce6230_i2c_algo, 286 .i2c_algo = &ce6230_i2c_algo,
286 287
287 .num_device_descs = 1, 288 .num_device_descs = 2,
288 .devices = { 289 .devices = {
289 { 290 {
290 .name = "Intel CE9500 reference design", 291 .name = "Intel CE9500 reference design",
291 .cold_ids = {NULL}, 292 .cold_ids = {NULL},
292 .warm_ids = {&ce6230_table[0], NULL}, 293 .warm_ids = {&ce6230_table[0], NULL},
293 }, 294 },
295 {
296 .name = "AVerMedia A310 USB 2.0 DVB-T tuner",
297 .cold_ids = {NULL},
298 .warm_ids = {&ce6230_table[1], NULL},
299 },
294 } 300 }
295}; 301};
296 302
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index dc7ea21cd139..ffe2a7335bee 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -167,6 +167,7 @@
167#define USB_PID_AVERMEDIA_VOLAR_X 0xa815 167#define USB_PID_AVERMEDIA_VOLAR_X 0xa815
168#define USB_PID_AVERMEDIA_VOLAR_X_2 0x8150 168#define USB_PID_AVERMEDIA_VOLAR_X_2 0x8150
169#define USB_PID_AVERMEDIA_A309 0xa309 169#define USB_PID_AVERMEDIA_A309 0xa309
170#define USB_PID_AVERMEDIA_A310 0xa310
170#define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006 171#define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006
171#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a 172#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a
172#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2 0x0081 173#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2 0x0081