From patchwork Sat May 4 04:05:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier GRENIE X-Patchwork-Id: 18301 X-Patchwork-Delegate: mkrufky@linuxtv.org Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UYTmH-0005G9-N5; Sat, 04 May 2013 06:08:53 +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.72/mailfrontend-6) with esmtp id 1UYTmF-0001xD-4J; Sat, 04 May 2013 06:08:53 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750892Ab3EDEIt (ORCPT + 1 other); Sat, 4 May 2013 00:08:49 -0400 Received: from co202.xi-lite.net ([149.6.83.202]:39013 "EHLO co202.xi-lite.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750705Ab3EDEIs (ORCPT ); Sat, 4 May 2013 00:08:48 -0400 Received: from ONYX.xi-lite.lan (unknown [193.34.35.244]) by co202.xi-lite.net (Postfix) with ESMTPS id 2C4602603BA; Sat, 4 May 2013 06:16:20 +0200 (CEST) Received: from SAPHIR.xi-lite.lan ([193.34.32.63]) by ONYX ([193.34.32.32]) with mapi; Sat, 4 May 2013 05:09:20 +0100 From: Olivier GRENIE To: Mauro Carvalho Chehab CC: "linux-media@vger.kernel.org" , Patrick BOETTCHER , Patrick Boettcher Date: Sat, 4 May 2013 05:05:50 +0100 Subject: RE: [GIT PULL FOR 3.10] DiBxxxx: fixes and improvements Thread-Topic: [GIT PULL FOR 3.10] DiBxxxx: fixes and improvements Thread-Index: Ac5DU5GWU229x43yRl6J/N4nnsiXGgFKRfmr Message-ID: References: <1411209.JetyNPSOgp@dibcom294>, <20130427112833.203d7fbb@redhat.com> In-Reply-To: <20130427112833.203d7fbb@redhat.com> Accept-Language: en-US, fr-FR Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US, fr-FR MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.5.4.40027 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MIME_TEXT_ONLY_MP_MIXED 0.05, MSGID_ADDED_BY_MTA 0.05, URI_ENDS_IN_HTML 0, __ANY_URI 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CP_URI_IN_BODY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __FORWARDED_MSG 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' Hello Mauro, can you apply the attached patch. This patch correct the proposed patch by Patrick for the dib807x. Sorry to not have seen it before. regards, Olivier From 6d5679558aa99d9763fb2d638de771a8f52c94fa Mon Sep 17 00:00:00 2001 From: Olivier Grenie Date: Thu, 2 May 2013 16:11:14 +0200 Subject: [PATCH] [media] dib8000: correct previous commit The intend of this patch is to correct a previous commit. This commit corrects the behavior of the dib807x. Signed-off-by: Olivier Grenie --- drivers/media/dvb-frontends/dib8000.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/dvb-frontends/dib8000.c b/drivers/media/dvb-frontends/dib8000.c index 4ba7c90..a57926b 100644 --- a/drivers/media/dvb-frontends/dib8000.c +++ b/drivers/media/dvb-frontends/dib8000.c @@ -2439,7 +2439,7 @@ static int dib8000_autosearch_start(struct dvb_frontend *fe) if (state->revision == 0x8090) internal = dib8000_read32(state, 23) / 1000; - if (state->autosearch_state == AS_SEARCHING_FFT) { + if ((state->revision >= 0x8002) && (state->autosearch_state == AS_SEARCHING_FFT)) { dib8000_write_word(state, 37, 0x0065); /* P_ctrl_pha_off_max default values */ dib8000_write_word(state, 116, 0x0000); /* P_ana_gain to 0 */ @@ -2475,7 +2475,7 @@ static int dib8000_autosearch_start(struct dvb_frontend *fe) dib8000_write_word(state, 770, (dib8000_read_word(state, 770) & 0xdfff) | (1 << 13)); /* P_restart_ccg = 1 */ dib8000_write_word(state, 770, (dib8000_read_word(state, 770) & 0xdfff) | (0 << 13)); /* P_restart_ccg = 0 */ dib8000_write_word(state, 0, (dib8000_read_word(state, 0) & 0x7ff) | (0 << 15) | (1 << 13)); /* P_restart_search = 0; */ - } else if (state->autosearch_state == AS_SEARCHING_GUARD) { + } else if ((state->revision >= 0x8002) && (state->autosearch_state == AS_SEARCHING_GUARD)) { state->fe[0]->dtv_property_cache.transmission_mode = TRANSMISSION_MODE_8K; state->fe[0]->dtv_property_cache.guard_interval = GUARD_INTERVAL_1_8; state->fe[0]->dtv_property_cache.inversion = 0; @@ -2577,7 +2577,7 @@ static int dib8000_autosearch_irq(struct dvb_frontend *fe) struct dib8000_state *state = fe->demodulator_priv; u16 irq_pending = dib8000_read_word(state, 1284); - if (state->autosearch_state == AS_SEARCHING_FFT) { + if ((state->revision >= 0x8002) && (state->autosearch_state == AS_SEARCHING_FFT)) { if (irq_pending & 0x1) { dprintk("dib8000_autosearch_irq: max correlation result available"); return 3; -- 1.7.10.4