Skip to content

Commit

Permalink
[media] rtl28xxu: support Delock USB 2.0 DVB-T
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Mair authored and Mauro Carvalho Chehab committed Jul 5, 2012
1 parent 40a2d3c commit ea76600
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions drivers/media/dvb/dvb-usb/dvb-usb-ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
#define USB_PID_CONCEPTRONIC_CTVDIGRCU 0xe397
#define USB_PID_CONEXANT_D680_DMB 0x86d6
#define USB_PID_CREATIX_CTX1921 0x1921
#define USB_PID_DELOCK_USB2_DVBT 0xb803
#define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064
#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM 0x0065
#define USB_PID_DIBCOM_MOD3000_COLD 0x0bb8
Expand Down
11 changes: 10 additions & 1 deletion drivers/media/dvb/dvb-usb/rtl28xxu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1155,6 +1155,7 @@ enum rtl28xxu_usb_table_entry {
RTL2831U_14AA_0160,
RTL2831U_14AA_0161,
RTL2832U_0CCD_00A9,
RTL2832U_1F4D_B803,
};

static struct usb_device_id rtl28xxu_table[] = {
Expand All @@ -1169,6 +1170,8 @@ static struct usb_device_id rtl28xxu_table[] = {
/* RTL2832U */
[RTL2832U_0CCD_00A9] = {
USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_BLACK_REV1)},
[RTL2832U_1F4D_B803] = {
USB_DEVICE(USB_VID_GTEK, USB_PID_DELOCK_USB2_DVBT)},
{} /* terminating entry */
};

Expand Down Expand Up @@ -1282,14 +1285,20 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = {

.i2c_algo = &rtl28xxu_i2c_algo,

.num_device_descs = 1,
.num_device_descs = 2,
.devices = {
{
.name = "Terratec Cinergy T Stick Black",
.warm_ids = {
&rtl28xxu_table[RTL2832U_0CCD_00A9],
},
},
{
.name = "G-Tek Electronics Group Lifeview LV5TDLX DVB-T",
.warm_ids = {
&rtl28xxu_table[RTL2832U_1F4D_B803],
},
},
}
},

Expand Down

0 comments on commit ea76600

Please sign in to comment.