From patchwork Mon Feb 15 17:37:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 2726 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Mon, 15 Feb 2010 17:38:14 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Mon, 15 Feb 2010 18:58:44 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1Nh4ti-0000Nb-4S; Mon, 15 Feb 2010 17:38:14 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755773Ab0BORiM (ORCPT + 1 other); Mon, 15 Feb 2010 12:38:12 -0500 Received: from mail-in-08.arcor-online.net ([151.189.21.48]:38148 "EHLO mail-in-08.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755643Ab0BORiL (ORCPT ); Mon, 15 Feb 2010 12:38:11 -0500 Received: from mail-in-11-z2.arcor-online.net (mail-in-11-z2.arcor-online.net [151.189.8.28]) by mx.arcor.de (Postfix) with ESMTP id 800D02AEE55; Mon, 15 Feb 2010 18:38:09 +0100 (CET) Received: from mail-in-14.arcor-online.net (mail-in-14.arcor-online.net [151.189.21.54]) by mail-in-11-z2.arcor-online.net (Postfix) with ESMTP id 6455E345BF1; Mon, 15 Feb 2010 18:38:09 +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-14.arcor-online.net (Postfix) with ESMTPA id EFA1128B08E; Mon, 15 Feb 2010 18:38:08 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-14.arcor-online.net EFA1128B08E DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1266255489; bh=/BXXSMdT/7LEN1bzr3Rkfi3Pmnzp8uTL616BF1UYRY0=; h=From:To:Cc:Subject:Date:Message-Id; b=LQd3plJXRtJpBoNUniQZtxPwFI6Ib503Y9igYcRO87y1xWyAfZT2cWbpvYyTrOBjs 9/v5lf0gy/GJfQ4R/ZM7Azb3XRR6jhqdHQ+MjIQvccEjNywjaydnkw9X06LdXU2zVD B1UMyTMmPdvcr0/aD4PNlV981Swd3i9XSbS12tRI= From: stefan.ringel@arcor.de To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, dheitmueller@kernellabs.com, Stefan Ringel Subject: [PATCH 01/11] xc2028: tm6000: bugfix firmware xc3028L-v36.fw used with Zarlink and DTV78 or DTV8 no shift Date: Mon, 15 Feb 2010 18:37:14 +0100 Message-Id: <1266255444-7422-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 From: Stefan Ringel Signed-off-by: Stefan Ringel 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