From patchwork Fri May 18 18:47:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Mair X-Patchwork-Id: 11323 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SVSEQ-00071e-25 for patchwork@linuxtv.org; Fri, 18 May 2012 20:48:54 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SVSEP-0007Wo-EL; Fri, 18 May 2012 20:48:54 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965609Ab2ERSsv (ORCPT ); Fri, 18 May 2012 14:48:51 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:46217 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964842Ab2ERSsu (ORCPT ); Fri, 18 May 2012 14:48:50 -0400 Received: by mail-bk0-f46.google.com with SMTP id ji2so2596772bkc.19 for ; Fri, 18 May 2012 11:48:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=mmgiPLOla4XeCoEg6d8bH+tfZocaBgeZOs+cHN7bmEM=; b=voGEtrESQTte53W6c4fV25I4A1wXBJkqwujLNeGu35s9vQf31cH4dv33yfPH9tFH/6 zTmE9U1g+SgeLidgiMKKPnJMjaDwhjzOe4QRwH5byVGxmRloeA38VnPaGHQqTwzjG5ZE IqgIHfku5XAVyFt9UIHE9Xs8mKj/g29g/eJsSbwjM+dpAWDi+5EioXyC2lnzyIjvx+5r SyiHvnW3+LGYN3OTAFZDNWRM18LmCBLgckV6AROlaoRO/e3wP6VZNIh4vGrDTKz6wokq DzbT7VkN0wTlCyN2kErKJi7eiCkYmjp6FElOJiSc0JPSE5H58ujtre6AkyosSXOlWRMg TUHA== Received: by 10.204.151.130 with SMTP id c2mr4404206bkw.125.1337366929796; Fri, 18 May 2012 11:48:49 -0700 (PDT) Received: from localhost (g228176128.adsl.alicedsl.de. [92.228.176.128]) by mx.google.com with ESMTPS id n17sm18881595bkw.5.2012.05.18.11.48.47 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 May 2012 11:48:48 -0700 (PDT) From: Thomas Mair To: linux-media@vger.kernel.org Cc: crope@iki.fi, pomidorabelisima@gmail.com, Thomas Mair , Hans-Frieder Vogt Subject: [PATCH v5 5/5] rtl28xxu: support Terratec Noxon DAB/DAB+ stick Date: Fri, 18 May 2012 20:47:44 +0200 Message-Id: <1337366864-1256-6-git-send-email-thomas.mair86@googlemail.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1337366864-1256-1-git-send-email-thomas.mair86@googlemail.com> References: <1> <1337366864-1256-1-git-send-email-thomas.mair86@googlemail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.18.183617 X-PMX-Spam: Gauge=X, Probability=10%, Report=' HASHBUSTER_BLOCK_V2 0.5, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HASHBUSTER_BLOCK_V2_1 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __LINES_OF_YELLING 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Signed-off-by: Hans-Frieder Vogt Signed-off-by: Thomas Mair Acked-by: Antti Palosaari Reviewed-by: Antti Palosaari --- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + 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 360f6b7..26c4481 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 @@ #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 diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.c b/drivers/media/dvb/dvb-usb/rtl28xxu.c index b2c8f67..0cac6fb 100644 --- a/drivers/media/dvb/dvb-usb/rtl28xxu.c +++ b/drivers/media/dvb/dvb-usb/rtl28xxu.c @@ -1153,6 +1153,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[] = { @@ -1169,6 +1170,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 */ }; @@ -1282,7 +1285,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", @@ -1296,6 +1299,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], + }, + }, } },