From patchwork Thu Feb 11 15:51:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 78729 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 o1BFoGSv031171 for ; Thu, 11 Feb 2010 15:52:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754561Ab0BKPwK (ORCPT ); Thu, 11 Feb 2010 10:52:10 -0500 Received: from mail-in-02.arcor-online.net ([151.189.21.42]:36465 "EHLO mail-in-02.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753075Ab0BKPwI (ORCPT ); Thu, 11 Feb 2010 10:52:08 -0500 Received: from mail-in-07-z2.arcor-online.net (mail-in-07-z2.arcor-online.net [151.189.8.19]) by mx.arcor.de (Postfix) with ESMTP id 05AA73FE5C1; Thu, 11 Feb 2010 16:52:06 +0100 (CET) Received: from mail-in-02.arcor-online.net (mail-in-02.arcor-online.net [151.189.21.42]) by mail-in-07-z2.arcor-online.net (Postfix) with ESMTP id EDBFE2C96FE; Thu, 11 Feb 2010 16:52:05 +0100 (CET) Received: from localhost.localdomain (dslb-188-103-172-103.pools.arcor-ip.net [188.103.172.103]) (Authenticated sender: stefan.ringel@arcor.de) by mail-in-02.arcor-online.net (Postfix) with ESMTPA id 974463FE5C1; Thu, 11 Feb 2010 16:52:05 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-02.arcor-online.net 974463FE5C1 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1265903525; bh=ozf9ueHFYIHC2HUwe5gdl/W6mMZCLzMCQISMON0h+1g=; h=From:To:Cc:Subject:Date:Message-Id; b=f3MJljD9qh9PwEQ1ti/DXWAnzzg82r0nAizgoUJzS4+CoUt4oDfEt2b1/hH5ehmE6 blrhjdUsP3fZK5O29JPJ/PEOi9v9FaxaU1rk9BXqlYF4/pgbUnsK4YE8QnU/QZL6IX 4Z+zuUxSTzckRbuD5jwfrC28V0eM0EvAdUFgTxyw= From: stefan.ringel@arcor.de To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, dheitmueller@kernellabs.com, Stefan Ringel Subject: [PATCH] tm6000: bugfix firmware xc3028L-v36.fw used with Zarlink and DTV78 or DTV8 no shift Date: Thu, 11 Feb 2010 16:51:26 +0100 Message-Id: <1265903486-15058-1-git-send-email-stefan.ringel@arcor.de> X-Mailer: git-send-email 1.6.6.1 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]); Thu, 11 Feb 2010 15:52:11 +0000 (UTC) diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c index ed50168..e051caa 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 ((priv->firm_version == 0x0306) && + (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