From patchwork Fri Feb 5 22:48:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 77439 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o15Mo7fA016854 for ; Fri, 5 Feb 2010 22:50:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934011Ab0BEWtI (ORCPT ); Fri, 5 Feb 2010 17:49:08 -0500 Received: from mail-in-06.arcor-online.net ([151.189.21.46]:47335 "EHLO mail-in-06.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933959Ab0BEWs6 (ORCPT ); Fri, 5 Feb 2010 17:48:58 -0500 Received: from mail-in-06-z2.arcor-online.net (mail-in-06-z2.arcor-online.net [151.189.8.18]) by mx.arcor.de (Postfix) with ESMTP id 3060239A666; Fri, 5 Feb 2010 23:48:57 +0100 (CET) Received: from mail-in-05.arcor-online.net (mail-in-05.arcor-online.net [151.189.21.45]) by mail-in-06-z2.arcor-online.net (Postfix) with ESMTP id 259515BEF9; Fri, 5 Feb 2010 23:48:57 +0100 (CET) Received: from localhost.localdomain (dslb-188-103-200-186.pools.arcor-ip.net [188.103.200.186]) (Authenticated sender: stefan.ringel@arcor.de) by mail-in-05.arcor-online.net (Postfix) with ESMTPA id C2C5633279F; Fri, 5 Feb 2010 23:48:56 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-05.arcor-online.net C2C5633279F DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1265410137; bh=WAa6fmgUdrb8/auXJfVJ0y6+zyVIrqeGd9ftPGhFst8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=fdXmN51dt+s7xPBHj95DWuLBZXWiJiEEaFNQA6+4oufRrrfud/2Y7Z/jYbXzGkkeD l3WSgaXkLOSxzZ1SIKkGFQQ7icjI05ecTSLHsrEfQnbI4NFbKzLXNX+wRA/W4S4oLj XpptA5XVSNGReEl7B6qTr0hDip+Jv7dlLQvbmc+w= From: stefan.ringel@arcor.de To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, dheitmueller@kernellabs.com, Stefan Ringel Subject: [PATCH 11/12] tm6000: bugfix firmware xc3028L-v36.fw used with Zarlink and DTV78 or DTV8 no shift Date: Fri, 5 Feb 2010 23:48:15 +0100 Message-Id: <1265410096-11788-10-git-send-email-stefan.ringel@arcor.de> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1265410096-11788-9-git-send-email-stefan.ringel@arcor.de> References: <1265410096-11788-1-git-send-email-stefan.ringel@arcor.de> <1265410096-11788-2-git-send-email-stefan.ringel@arcor.de> <1265410096-11788-3-git-send-email-stefan.ringel@arcor.de> <1265410096-11788-4-git-send-email-stefan.ringel@arcor.de> <1265410096-11788-5-git-send-email-stefan.ringel@arcor.de> <1265410096-11788-6-git-send-email-stefan.ringel@arcor.de> <1265410096-11788-7-git-send-email-stefan.ringel@arcor.de> <1265410096-11788-8-git-send-email-stefan.ringel@arcor.de> <1265410096-11788-9-git-send-email-stefan.ringel@arcor.de> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 05 Feb 2010 22:50:07 +0000 (UTC) diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c index ed50168..fcf19cc 100644 --- a/drivers/media/common/tuners/tuner-xc2028.c +++ b/drivers/media/common/tuners/tuner-xc2028.c @@ -1114,7 +1114,12 @@ static int xc2028_set_params(struct dvb_frontend *fe, /* All S-code tables need a 200kHz shift */ if (priv->ctrl.demod) { - demod = priv->ctrl.demod + 200; + if ((strcmp (priv->ctrl.fname, "xc3028L-v36.fw") == 0) && + (priv->ctrl.demod == XC3028_FE_ZARLINK456) && + ((type & DTV78) || (type & DTV8))) + demod = priv->ctrl.demod; + else + demod = priv->ctrl.demod + 200; /* * The DTV7 S-code table needs a 700 kHz shift. * Thanks to Terry Wu for reporting this