aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorSam Doshi <sam@metal-fish.co.uk>2010-12-18 10:58:54 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:17:03 -0500
commit10304ca65f8871ad9f6725a7480522034184f55f (patch)
tree426c2d95952c7927899537164d9455de5069dc5f /drivers/media/dvb
parentc3353330508aee4390442df2d7f6ce0ef5006185 (diff)
[media] drivers:media:dvb: add USB PIDs for Elgato EyeTV Sat
Adds USB PIDs for the Elgato EyeTV Sat device. This device is a clone of the Terratec S7. Signed-off-by: Sam Doshi <sam@metal-fish.co.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/dvb-usb/az6027.c7
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/az6027.c b/drivers/media/dvb/dvb-usb/az6027.c
index 9a7837fcfd7f..57e2444d51ab 100644
--- a/drivers/media/dvb/dvb-usb/az6027.c
+++ b/drivers/media/dvb/dvb-usb/az6027.c
@@ -1089,6 +1089,7 @@ static struct usb_device_id az6027_usb_table[] = {
1089 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_DVBS2CI_V2) }, 1089 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_DVBS2CI_V2) },
1090 { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V1) }, 1090 { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V1) },
1091 { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V2) }, 1091 { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V2) },
1092 { USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_SAT) },
1092 { }, 1093 { },
1093}; 1094};
1094 1095
@@ -1134,7 +1135,7 @@ static struct dvb_usb_device_properties az6027_properties = {
1134 1135
1135 .i2c_algo = &az6027_i2c_algo, 1136 .i2c_algo = &az6027_i2c_algo,
1136 1137
1137 .num_device_descs = 5, 1138 .num_device_descs = 6,
1138 .devices = { 1139 .devices = {
1139 { 1140 {
1140 .name = "AZUREWAVE DVB-S/S2 USB2.0 (AZ6027)", 1141 .name = "AZUREWAVE DVB-S/S2 USB2.0 (AZ6027)",
@@ -1156,6 +1157,10 @@ static struct dvb_usb_device_properties az6027_properties = {
1156 .name = "Technisat SkyStar USB 2 HD CI", 1157 .name = "Technisat SkyStar USB 2 HD CI",
1157 .cold_ids = { &az6027_usb_table[4], NULL }, 1158 .cold_ids = { &az6027_usb_table[4], NULL },
1158 .warm_ids = { NULL }, 1159 .warm_ids = { NULL },
1160 }, {
1161 .name = "Elgato EyeTV Sat",
1162 .cold_ids = { &az6027_usb_table[5], NULL },
1163 .warm_ids = { NULL },
1159 }, 1164 },
1160 { NULL }, 1165 { NULL },
1161 } 1166 }
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 192a40ce583d..1a6310b61923 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -301,6 +301,7 @@
301#define USB_PID_ELGATO_EYETV_DIVERSITY 0x0011 301#define USB_PID_ELGATO_EYETV_DIVERSITY 0x0011
302#define USB_PID_ELGATO_EYETV_DTT 0x0021 302#define USB_PID_ELGATO_EYETV_DTT 0x0021
303#define USB_PID_ELGATO_EYETV_DTT_Dlx 0x0020 303#define USB_PID_ELGATO_EYETV_DTT_Dlx 0x0020
304#define USB_PID_ELGATO_EYETV_SAT 0x002a
304#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD 0x5000 305#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD 0x5000
305#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM 0x5001 306#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM 0x5001
306#define USB_PID_FRIIO_WHITE 0x0001 307#define USB_PID_FRIIO_WHITE 0x0001