From patchwork Sat May 12 20:47:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Mair X-Patchwork-Id: 11198 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1STJEC-0005UR-LM for patchwork@linuxtv.org; Sat, 12 May 2012 22:47:48 +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-2) with esmtp for id 1STJEB-0002NQ-J2; Sat, 12 May 2012 22:47:48 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756361Ab2ELUrp (ORCPT ); Sat, 12 May 2012 16:47:45 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:59279 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756359Ab2ELUro (ORCPT ); Sat, 12 May 2012 16:47:44 -0400 Received: by bkcji2 with SMTP id ji2so2977097bkc.19 for ; Sat, 12 May 2012 13:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding; bh=BrfWN8sxP7rWDeNaKLjkOaByLwlUmr83w0w5q/T6n58=; b=SNelJTxtRNcVVYoGvvwOzTZ4xK0ix5aa3Ijp2Ux85+EO9QfgkEHP3oZcXudSYgqWnp 9lXAix6Kdclt81EAxTpSRNqG3vKMWZyptdFc/yatpihbzFiYxvrTfLAsm9Bm9/2YZVmP eLII7sLsH0MqLTfBRBUVgmOUUmPsLIJzkgzUZ6qenrLI2wvG+Rs61CI8pnVEMkzMQ91C XdeWj+kq5kFtchhTA7ejAp+un+M86oNH55zjBsR4zPMXIGo8fnqFZuxq7MnjHujC+KxE n40hoO5VSR3zBBvfPwRJ7LDaI7GXJRgFJcwTA6dhOjXNA1pEOTxC4K4WhnIHdKK/dPWq koqw== Received: by 10.204.152.202 with SMTP id h10mr989965bkw.85.1336855663247; Sat, 12 May 2012 13:47:43 -0700 (PDT) Received: from [192.168.1.89] (g228179134.adsl.alicedsl.de. [92.228.179.134]) by mx.google.com with ESMTPS id f11sm25251166bkw.6.2012.05.12.13.47.41 (version=SSLv3 cipher=OTHER); Sat, 12 May 2012 13:47:42 -0700 (PDT) Message-ID: <4FAECC6C.6050602@googlemail.com> Date: Sat, 12 May 2012 22:47:40 +0200 From: Thomas Mair User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120424 Thunderbird/12.0 MIME-Version: 1.0 To: linux-media@vger.kernel.org Subject: Re: [PATCH 5/5] rtl28xxu: support Terratec Noxon DAB/DAB+ stick References: <1336846109-30070-1-git-send-email-thomas.mair86@googlemail.com> <1336846109-30070-6-git-send-email-thomas.mair86@googlemail.com> In-Reply-To: <1336846109-30070-6-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.12.203623 X-PMX-Spam: Gauge=X, Probability=10%, Report=' HASHBUSTER_BLOCK_V2 0.5, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HASHBUSTER_BLOCK_V2_1 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __LINES_OF_YELLING 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 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 , __USER_AGENT 0' The patch contains two small errors that prevent its application. This is the fixed version. Signed-off-by: Hans-Frieder Vogt Signed-off-by: Thomas Mair --- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + drivers/media/dvb/dvb-usb/rtl28xxu.c | 27 ++++++++++++++++++++++++++- 2 files changed, 27 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 b0a86e9..95c9c14 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h @@ -244,6 +244,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 699da68..bacc783 100644 --- a/drivers/media/dvb/dvb-usb/rtl28xxu.c +++ b/drivers/media/dvb/dvb-usb/rtl28xxu.c @@ -29,6 +29,7 @@ #include "mt2060.h" #include "mxl5005s.h" #include "fc0012.h" +#include "fc0013.h" /* debug */ static int dvb_usb_rtl28xxu_debug; @@ -388,6 +389,12 @@ static struct rtl2832_config rtl28xxu_rtl2832_fc0012_config = { .tuner = TUNER_RTL2832_FC0012 }; +static struct rtl2832_config rtl28xxu_rtl2832_fc0013_config = { + .i2c_addr = 0x10, /* 0x20 */ + .xtal = 28800000, + .if_dvbt = 0, + .tuner = TUNER_RTL2832_FC0013 +}; static int rtl2832u_fc0012_tuner_callback(struct dvb_usb_device *d, int cmd, int arg) @@ -553,6 +560,7 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap) ret = rtl28xxu_ctrl_msg(adap->dev, &req_fc0013); if (ret == 0 && buf[0] == 0xa3) { priv->tuner = TUNER_RTL2832_FC0013; + rtl2832_config = &rtl28xxu_rtl2832_fc0013_config; info("%s: FC0013 tuner found\n", __func__); goto found; } @@ -750,6 +758,14 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap) fe->ops.tuner_ops.get_rf_strength; return 0; break; + case TUNER_RTL2832_FC0013: + fe = dvb_attach(fc0013_attach, adap->fe_adap[0].fe, + &adap->dev->i2c_adap, 0xc6>>1, 0, FC_XTAL_28_8_MHZ); + + /* fc0013 also supports signal strength reading */ + adap->fe_adap[0].fe->ops.read_signal_strength = adap->fe_adap[0] + .fe->ops.tuner_ops.get_rf_strength; + return 0; default: fe = NULL; err("unknown tuner=%d", priv->tuner); @@ -1136,6 +1152,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[] = { @@ -1152,6 +1169,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_GTEK)}, + [RTL2832U_0CCD_00B3] = { + USB_DEVICE(USB_VID_TERRATEC, USB_PID_NOXON_DAB_STICK)}, {} /* terminating entry */ }; @@ -1265,7 +1284,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", @@ -1279,6 +1298,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], + }, + }, } },