aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/usb/dvb-usb/dw2102.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 24cfd4bbbc8a..d5957b0299d3 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -79,6 +79,10 @@
79#define USB_PID_TEVII_S632 0xd632 79#define USB_PID_TEVII_S632 0xd632
80#endif 80#endif
81 81
82#ifndef USB_PID_GOTVIEW_SAT_HD
83#define USB_PID_GOTVIEW_SAT_HD 0x5456
84#endif
85
82#define DW210X_READ_MSG 0 86#define DW210X_READ_MSG 0
83#define DW210X_WRITE_MSG 1 87#define DW210X_WRITE_MSG 1
84 88
@@ -1549,6 +1553,7 @@ enum dw2102_table_entry {
1549 TEVII_S421, 1553 TEVII_S421,
1550 TEVII_S632, 1554 TEVII_S632,
1551 TERRATEC_CINERGY_S2_R2, 1555 TERRATEC_CINERGY_S2_R2,
1556 GOTVIEW_SAT_HD,
1552}; 1557};
1553 1558
1554static struct usb_device_id dw2102_table[] = { 1559static struct usb_device_id dw2102_table[] = {
@@ -1570,6 +1575,7 @@ static struct usb_device_id dw2102_table[] = {
1570 [TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)}, 1575 [TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)},
1571 [TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)}, 1576 [TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)},
1572 [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00b0)}, 1577 [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00b0)},
1578 [GOTVIEW_SAT_HD] = {USB_DEVICE(0x1FE1, USB_PID_GOTVIEW_SAT_HD)},
1573 { } 1579 { }
1574}; 1580};
1575 1581
@@ -1970,7 +1976,7 @@ static struct dvb_usb_device_properties su3000_properties = {
1970 }}, 1976 }},
1971 } 1977 }
1972 }, 1978 },
1973 .num_device_descs = 4, 1979 .num_device_descs = 5,
1974 .devices = { 1980 .devices = {
1975 { "SU3000HD DVB-S USB2.0", 1981 { "SU3000HD DVB-S USB2.0",
1976 { &dw2102_table[GENIATECH_SU3000], NULL }, 1982 { &dw2102_table[GENIATECH_SU3000], NULL },
@@ -1988,6 +1994,10 @@ static struct dvb_usb_device_properties su3000_properties = {
1988 { &dw2102_table[TERRATEC_CINERGY_S2_R2], NULL }, 1994 { &dw2102_table[TERRATEC_CINERGY_S2_R2], NULL },
1989 { NULL }, 1995 { NULL },
1990 }, 1996 },
1997 { "GOTVIEW Satellite HD",
1998 { &dw2102_table[GOTVIEW_SAT_HD], NULL },
1999 { NULL },
2000 },
1991 } 2001 }
1992}; 2002};
1993 2003