From patchwork Sun Feb 9 13:04:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 3613051 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C7FB3BF418 for ; Sun, 9 Feb 2014 13:04:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF3A32018A for ; Sun, 9 Feb 2014 13:04:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 21B3520171 for ; Sun, 9 Feb 2014 13:04:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752132AbaBINE3 (ORCPT ); Sun, 9 Feb 2014 08:04:29 -0500 Received: from mail-we0-f170.google.com ([74.125.82.170]:36951 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751852AbaBINE1 (ORCPT ); Sun, 9 Feb 2014 08:04:27 -0500 Received: by mail-we0-f170.google.com with SMTP id w62so3540093wes.1 for ; Sun, 09 Feb 2014 05:04:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type:mime-version :content-transfer-encoding; bh=LAN/IJBf4+ZYovf3cHfx8wbhY0qSiszJK4Qk3fDq7zc=; b=UK8wlS2L+RlbWX4tyxB3s+jfrVc46BJVe0QtrT81KToxj+hNiFR/L75vUy0Xo+xX7l 81vIGZBHoxRsk/+XohZmHTmQWMUWPhO3yktEu+7/u8chBMeM4Os0dPHSmaf8w2OyKJAS Tnio4qvErZODmo1TpBEeum/CIRDJRaeKLByuusFxz3xodmbCwMdGkY1uUbIB9hnUBMPW 2T4/M8UQuWWsXrrhXtshWdFsJg4prpOjbXNaQm7WMLN0td4/gQgPs6zFLhDDrIdfifuB 8WhwxtzaV9BqDjEOvqAdonbX92fVzt4SGBT6tEVp1hBHhV0RSkCJntWU68lhYdYuuHoD Jbew== X-Received: by 10.180.163.206 with SMTP id yk14mr6687171wib.5.1391951066338; Sun, 09 Feb 2014 05:04:26 -0800 (PST) Received: from [192.168.1.100] (92.40.105.47.threembb.co.uk. [92.40.105.47]) by mx.google.com with ESMTPSA id ga20sm20529454wic.0.2014.02.09.05.04.22 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Sun, 09 Feb 2014 05:04:25 -0800 (PST) Message-ID: <1391951046.13992.15.camel@canaries32-MCP7A> Subject: [PATCH 2/2] af9035: Add remaining it913x dual ids to af9035. From: Malcolm Priestley To: linux-media@vger.kernel.org Cc: Antti Palosaari Date: Sun, 09 Feb 2014 13:04:06 +0000 X-Mailer: Evolution 3.10.3-0ubuntu3 Mime-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As follow on to patch af9035: Move it913x single devices to af9035 and patch 1. SNR is reported as db/10 values. All dual ids are added to af9035 and it913x driver disabled. it913x/it913x-fe removal patches to follow. Signed-off-by: Malcolm Priestley --- drivers/media/usb/dvb-usb-v2/af9035.c | 8 ++++++++ drivers/media/usb/dvb-usb-v2/it913x.c | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c index 4f682ad..49e8360 100644 --- a/drivers/media/usb/dvb-usb-v2/af9035.c +++ b/drivers/media/usb/dvb-usb-v2/af9035.c @@ -1552,6 +1552,14 @@ static const struct usb_device_id af9035_id_table[] = { &af9035_props, "Avermedia A835B(4835)", RC_MAP_IT913X_V2) }, { DVB_USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_H335, &af9035_props, "Avermedia H335", RC_MAP_IT913X_V2) }, + { DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB499_2T_T09, + &af9035_props, "Kworld UB499-2T T09", RC_MAP_IT913X_V1) }, + { DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV22_IT9137, + &af9035_props, "Sveon STV22 Dual DVB-T HDTV", + RC_MAP_IT913X_V1) }, + { DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_CTVDIGDUAL_V2, + &af9035_props, "Digital Dual TV Receiver CTVDIGDUAL_V2", + RC_MAP_IT913X_V1) }, /* XXX: that same ID [0ccd:0099] is used by af9015 driver too */ { DVB_USB_DEVICE(USB_VID_TERRATEC, 0x0099, &af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)", NULL) }, diff --git a/drivers/media/usb/dvb-usb-v2/it913x.c b/drivers/media/usb/dvb-usb-v2/it913x.c index 78bf8fd..39488f8 100644 --- a/drivers/media/usb/dvb-usb-v2/it913x.c +++ b/drivers/media/usb/dvb-usb-v2/it913x.c @@ -781,6 +781,8 @@ static const struct usb_device_id it913x_id_table[] = { {} /* Terminating entry */ }; +#if 0 + MODULE_DEVICE_TABLE(usb, it913x_id_table); static struct usb_driver it913x_driver = { @@ -792,8 +794,11 @@ static struct usb_driver it913x_driver = { .id_table = it913x_id_table, }; + module_usb_driver(it913x_driver); +#endif + MODULE_AUTHOR("Malcolm Priestley "); MODULE_DESCRIPTION("it913x USB 2 Driver"); MODULE_VERSION("1.33");