aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-05-07 14:16:36 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 12:21:05 -0400
commitd281c1f1443b36890c35de71d9fdaa5cd3899003 (patch)
tree5609deb1e780fc93e8fc4b623325d0669c65640d
parent1cbabf9c751f8795a35885fad9ceaec7de71a29e (diff)
[media] af9035: add few new reference design USB IDs
Add all known reference design USB IDs. Rename two earlier reference design USB IDs. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/af9035.c16
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h7
2 files changed, 19 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9035.c b/drivers/media/dvb/dvb-usb/af9035.c
index d97f45e39f4f..e83b39d3993c 100644
--- a/drivers/media/dvb/dvb-usb/af9035.c
+++ b/drivers/media/dvb/dvb-usb/af9035.c
@@ -990,7 +990,10 @@ err:
990 990
991enum af9035_id_entry { 991enum af9035_id_entry {
992 AF9035_15A4_9035, 992 AF9035_15A4_9035,
993 AF9035_15A4_1000,
993 AF9035_15A4_1001, 994 AF9035_15A4_1001,
995 AF9035_15A4_1002,
996 AF9035_15A4_1003,
994 AF9035_0CCD_0093, 997 AF9035_0CCD_0093,
995 AF9035_07CA_A835, 998 AF9035_07CA_A835,
996 AF9035_07CA_B835, 999 AF9035_07CA_B835,
@@ -1001,9 +1004,15 @@ enum af9035_id_entry {
1001 1004
1002static struct usb_device_id af9035_id[] = { 1005static struct usb_device_id af9035_id[] = {
1003 [AF9035_15A4_9035] = { 1006 [AF9035_15A4_9035] = {
1004 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035)}, 1007 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_9035)},
1008 [AF9035_15A4_1000] = {
1009 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_1000)},
1005 [AF9035_15A4_1001] = { 1010 [AF9035_15A4_1001] = {
1006 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_2)}, 1011 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_1001)},
1012 [AF9035_15A4_1002] = {
1013 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_1002)},
1014 [AF9035_15A4_1003] = {
1015 USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_1003)},
1007 [AF9035_0CCD_0093] = { 1016 [AF9035_0CCD_0093] = {
1008 USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK)}, 1017 USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK)},
1009 [AF9035_07CA_A835] = { 1018 [AF9035_07CA_A835] = {
@@ -1074,7 +1083,10 @@ static struct dvb_usb_device_properties af9035_properties[] = {
1074 .name = "Afatech AF9035 reference design", 1083 .name = "Afatech AF9035 reference design",
1075 .cold_ids = { 1084 .cold_ids = {
1076 &af9035_id[AF9035_15A4_9035], 1085 &af9035_id[AF9035_15A4_9035],
1086 &af9035_id[AF9035_15A4_1000],
1077 &af9035_id[AF9035_15A4_1001], 1087 &af9035_id[AF9035_15A4_1001],
1088 &af9035_id[AF9035_15A4_1002],
1089 &af9035_id[AF9035_15A4_1003],
1078 }, 1090 },
1079 }, { 1091 }, {
1080 .name = "TerraTec Cinergy T Stick", 1092 .name = "TerraTec Cinergy T Stick",
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 2418e41ed0dc..7a6160bf54ba 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -76,8 +76,11 @@
76#define USB_PID_AFATECH_AF9005 0x9020 76#define USB_PID_AFATECH_AF9005 0x9020
77#define USB_PID_AFATECH_AF9015_9015 0x9015 77#define USB_PID_AFATECH_AF9015_9015 0x9015
78#define USB_PID_AFATECH_AF9015_9016 0x9016 78#define USB_PID_AFATECH_AF9015_9016 0x9016
79#define USB_PID_AFATECH_AF9035 0x9035 79#define USB_PID_AFATECH_AF9035_1000 0x1000
80#define USB_PID_AFATECH_AF9035_2 0x1001 80#define USB_PID_AFATECH_AF9035_1001 0x1001
81#define USB_PID_AFATECH_AF9035_1002 0x1002
82#define USB_PID_AFATECH_AF9035_1003 0x1003
83#define USB_PID_AFATECH_AF9035_9035 0x9035
81#define USB_PID_TREKSTOR_DVBT 0x901b 84#define USB_PID_TREKSTOR_DVBT 0x901b
82#define USB_VID_ALINK_DTU 0xf170 85#define USB_VID_ALINK_DTU 0xf170
83#define USB_PID_ANSONIC_DVBT_USB 0x6000 86#define USB_PID_ANSONIC_DVBT_USB 0x6000