Skip to content

Commit

Permalink
[media] rtl28xxu: support Terratec Noxon DAB/DAB+ stick
Browse files Browse the repository at this point in the history
Signed-off-by: Hans-Frieder Vogt <hfvogt@gmx.net>
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 ea76600 commit 36ad92e
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 @@ -247,6 +247,7 @@
#define USB_PID_TERRATEC_H7_2 0x10a3
#define USB_PID_TERRATEC_T3 0x10a0
#define USB_PID_TERRATEC_T5 0x10a1
#define USB_PID_NOXON_DAB_STICK 0x00b3
#define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e
#define USB_PID_PINNACLE_PCTV2000E 0x022c
#define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228
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 @@ -1156,6 +1156,7 @@ enum rtl28xxu_usb_table_entry {
RTL2831U_14AA_0161,
RTL2832U_0CCD_00A9,
RTL2832U_1F4D_B803,
RTL2832U_0CCD_00B3,
};

static struct usb_device_id rtl28xxu_table[] = {
Expand All @@ -1172,6 +1173,8 @@ static struct usb_device_id rtl28xxu_table[] = {
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)},
[RTL2832U_0CCD_00B3] = {
USB_DEVICE(USB_VID_TERRATEC, USB_PID_NOXON_DAB_STICK)},
{} /* terminating entry */
};

Expand Down Expand Up @@ -1285,7 +1288,7 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = {

.i2c_algo = &rtl28xxu_i2c_algo,

.num_device_descs = 2,
.num_device_descs = 3,
.devices = {
{
.name = "Terratec Cinergy T Stick Black",
Expand All @@ -1299,6 +1302,12 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = {
&rtl28xxu_table[RTL2832U_1F4D_B803],
},
},
{
.name = "NOXON DAB/DAB+ USB dongle",
.warm_ids = {
&rtl28xxu_table[RTL2832U_0CCD_00B3],
},
},
}
},

Expand Down

0 comments on commit 36ad92e

Please sign in to comment.