diff options
author | Thomas Mair <thomas.mair86@googlemail.com> | 2012-05-18 13:47:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-05 11:58:50 -0400 |
commit | ea76600fd4a3a0343899d7fa12e29bf5789cfd10 (patch) | |
tree | 6f36fbebb6fc72057bed2a28c46454a421f52479 | |
parent | 40a2d3c7629ef2979c959dcb908a37ba79f70f65 (diff) |
[media] rtl28xxu: support Delock USB 2.0 DVB-T
Signed-off-by: Thomas Mair <thomas.mair86@googlemail.com>
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
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/dvb-usb-ids.h | 1 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/rtl28xxu.c | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index cd9254cc272..360f6b7f3f7 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
@@ -100,6 +100,7 @@ | |||
100 | #define USB_PID_CONCEPTRONIC_CTVDIGRCU 0xe397 | 100 | #define USB_PID_CONCEPTRONIC_CTVDIGRCU 0xe397 |
101 | #define USB_PID_CONEXANT_D680_DMB 0x86d6 | 101 | #define USB_PID_CONEXANT_D680_DMB 0x86d6 |
102 | #define USB_PID_CREATIX_CTX1921 0x1921 | 102 | #define USB_PID_CREATIX_CTX1921 0x1921 |
103 | #define USB_PID_DELOCK_USB2_DVBT 0xb803 | ||
103 | #define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064 | 104 | #define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064 |
104 | #define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM 0x0065 | 105 | #define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM 0x0065 |
105 | #define USB_PID_DIBCOM_MOD3000_COLD 0x0bb8 | 106 | #define USB_PID_DIBCOM_MOD3000_COLD 0x0bb8 |
diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.c b/drivers/media/dvb/dvb-usb/rtl28xxu.c index 2df6e53810d..c1e1674aa8b 100644 --- a/drivers/media/dvb/dvb-usb/rtl28xxu.c +++ b/drivers/media/dvb/dvb-usb/rtl28xxu.c | |||
@@ -1155,6 +1155,7 @@ enum rtl28xxu_usb_table_entry { | |||
1155 | RTL2831U_14AA_0160, | 1155 | RTL2831U_14AA_0160, |
1156 | RTL2831U_14AA_0161, | 1156 | RTL2831U_14AA_0161, |
1157 | RTL2832U_0CCD_00A9, | 1157 | RTL2832U_0CCD_00A9, |
1158 | RTL2832U_1F4D_B803, | ||
1158 | }; | 1159 | }; |
1159 | 1160 | ||
1160 | static struct usb_device_id rtl28xxu_table[] = { | 1161 | static struct usb_device_id rtl28xxu_table[] = { |
@@ -1169,6 +1170,8 @@ static struct usb_device_id rtl28xxu_table[] = { | |||
1169 | /* RTL2832U */ | 1170 | /* RTL2832U */ |
1170 | [RTL2832U_0CCD_00A9] = { | 1171 | [RTL2832U_0CCD_00A9] = { |
1171 | USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_BLACK_REV1)}, | 1172 | USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_BLACK_REV1)}, |
1173 | [RTL2832U_1F4D_B803] = { | ||
1174 | USB_DEVICE(USB_VID_GTEK, USB_PID_DELOCK_USB2_DVBT)}, | ||
1172 | {} /* terminating entry */ | 1175 | {} /* terminating entry */ |
1173 | }; | 1176 | }; |
1174 | 1177 | ||
@@ -1282,7 +1285,7 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { | |||
1282 | 1285 | ||
1283 | .i2c_algo = &rtl28xxu_i2c_algo, | 1286 | .i2c_algo = &rtl28xxu_i2c_algo, |
1284 | 1287 | ||
1285 | .num_device_descs = 1, | 1288 | .num_device_descs = 2, |
1286 | .devices = { | 1289 | .devices = { |
1287 | { | 1290 | { |
1288 | .name = "Terratec Cinergy T Stick Black", | 1291 | .name = "Terratec Cinergy T Stick Black", |
@@ -1290,6 +1293,12 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { | |||
1290 | &rtl28xxu_table[RTL2832U_0CCD_00A9], | 1293 | &rtl28xxu_table[RTL2832U_0CCD_00A9], |
1291 | }, | 1294 | }, |
1292 | }, | 1295 | }, |
1296 | { | ||
1297 | .name = "G-Tek Electronics Group Lifeview LV5TDLX DVB-T", | ||
1298 | .warm_ids = { | ||
1299 | &rtl28xxu_table[RTL2832U_1F4D_B803], | ||
1300 | }, | ||
1301 | }, | ||
1293 | } | 1302 | } |
1294 | }, | 1303 | }, |
1295 | 1304 | ||