diff options
author | Thomas Mair <thomas.mair86@googlemail.com> | 2012-05-18 13:47:44 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-05 11:59:00 -0400 |
commit | 36ad92e06e4777e3c3c433797aa89c6a6e7d2fd2 (patch) | |
tree | 343c249d0450ecb1e807ad28a3bbabacf0719150 | |
parent | ea76600fd4a3a0343899d7fa12e29bf5789cfd10 (diff) |
[media] rtl28xxu: support Terratec Noxon DAB/DAB+ stick
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>
-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 360f6b7f3f71..26c44818a5ab 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
@@ -247,6 +247,7 @@ | |||
247 | #define USB_PID_TERRATEC_H7_2 0x10a3 | 247 | #define USB_PID_TERRATEC_H7_2 0x10a3 |
248 | #define USB_PID_TERRATEC_T3 0x10a0 | 248 | #define USB_PID_TERRATEC_T3 0x10a0 |
249 | #define USB_PID_TERRATEC_T5 0x10a1 | 249 | #define USB_PID_TERRATEC_T5 0x10a1 |
250 | #define USB_PID_NOXON_DAB_STICK 0x00b3 | ||
250 | #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e | 251 | #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e |
251 | #define USB_PID_PINNACLE_PCTV2000E 0x022c | 252 | #define USB_PID_PINNACLE_PCTV2000E 0x022c |
252 | #define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228 | 253 | #define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228 |
diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.c b/drivers/media/dvb/dvb-usb/rtl28xxu.c index c1e1674aa8ba..6bd0bd792437 100644 --- a/drivers/media/dvb/dvb-usb/rtl28xxu.c +++ b/drivers/media/dvb/dvb-usb/rtl28xxu.c | |||
@@ -1156,6 +1156,7 @@ enum rtl28xxu_usb_table_entry { | |||
1156 | RTL2831U_14AA_0161, | 1156 | RTL2831U_14AA_0161, |
1157 | RTL2832U_0CCD_00A9, | 1157 | RTL2832U_0CCD_00A9, |
1158 | RTL2832U_1F4D_B803, | 1158 | RTL2832U_1F4D_B803, |
1159 | RTL2832U_0CCD_00B3, | ||
1159 | }; | 1160 | }; |
1160 | 1161 | ||
1161 | static struct usb_device_id rtl28xxu_table[] = { | 1162 | static struct usb_device_id rtl28xxu_table[] = { |
@@ -1172,6 +1173,8 @@ static struct usb_device_id rtl28xxu_table[] = { | |||
1172 | USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_BLACK_REV1)}, | 1173 | USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_BLACK_REV1)}, |
1173 | [RTL2832U_1F4D_B803] = { | 1174 | [RTL2832U_1F4D_B803] = { |
1174 | USB_DEVICE(USB_VID_GTEK, USB_PID_DELOCK_USB2_DVBT)}, | 1175 | USB_DEVICE(USB_VID_GTEK, USB_PID_DELOCK_USB2_DVBT)}, |
1176 | [RTL2832U_0CCD_00B3] = { | ||
1177 | USB_DEVICE(USB_VID_TERRATEC, USB_PID_NOXON_DAB_STICK)}, | ||
1175 | {} /* terminating entry */ | 1178 | {} /* terminating entry */ |
1176 | }; | 1179 | }; |
1177 | 1180 | ||
@@ -1285,7 +1288,7 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { | |||
1285 | 1288 | ||
1286 | .i2c_algo = &rtl28xxu_i2c_algo, | 1289 | .i2c_algo = &rtl28xxu_i2c_algo, |
1287 | 1290 | ||
1288 | .num_device_descs = 2, | 1291 | .num_device_descs = 3, |
1289 | .devices = { | 1292 | .devices = { |
1290 | { | 1293 | { |
1291 | .name = "Terratec Cinergy T Stick Black", | 1294 | .name = "Terratec Cinergy T Stick Black", |
@@ -1299,6 +1302,12 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = { | |||
1299 | &rtl28xxu_table[RTL2832U_1F4D_B803], | 1302 | &rtl28xxu_table[RTL2832U_1F4D_B803], |
1300 | }, | 1303 | }, |
1301 | }, | 1304 | }, |
1305 | { | ||
1306 | .name = "NOXON DAB/DAB+ USB dongle", | ||
1307 | .warm_ids = { | ||
1308 | &rtl28xxu_table[RTL2832U_0CCD_00B3], | ||
1309 | }, | ||
1310 | }, | ||
1302 | } | 1311 | } |
1303 | }, | 1312 | }, |
1304 | 1313 | ||