From patchwork Fri Jun 5 21:52:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Walls X-Patchwork-Id: 1165 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Fri, 05 Jun 2009 21:57:05 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Fri, 05 Jun 2009 18:57:55 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MChPN-00061m-C0; Fri, 05 Jun 2009 21:57:05 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751580AbZFEV4u (ORCPT + 1 other); Fri, 5 Jun 2009 17:56:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752311AbZFEV4t (ORCPT ); Fri, 5 Jun 2009 17:56:49 -0400 Received: from mail1.radix.net ([207.192.128.31]:33324 "EHLO mail1.radix.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751563AbZFEV4s (ORCPT ); Fri, 5 Jun 2009 17:56:48 -0400 Received: from [192.168.1.2] (02-059.155.popsite.net [66.217.132.59]) (authenticated bits=0) by mail1.radix.net (8.13.4/8.13.4) with ESMTP id n55LpRGK026443; Fri, 5 Jun 2009 17:51:32 -0400 (EDT) Subject: [PATCH] tuner-simple, tveeprom: Add support for the FQ1216LME MK3 From: Andy Walls To: hermann pitton , linux-media@vger.kernel.org Cc: Hans Verkuil , Dmitri Belimov , Ant , Martin Dauskardt , Mauro Carvalho Chehab , Discussion list for development of the IVTV driver In-Reply-To: <1243502498.3722.17.camel@pc07.localdom.local> References: <200905210909.43333.martin.dauskardt@gmx.de> <1243389830.4046.52.camel@palomino.walls.org> <4A1CB353.7020906@symons.net.au> <200905270809.53056.hverkuil@xs4all.nl> <1243502498.3722.17.camel@pc07.localdom.local> Date: Fri, 05 Jun 2009 17:52:12 -0400 Message-Id: <1244238732.4440.15.camel@palomino.walls.org> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-1.fc10) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi, This patch: 1. adds explicit support for the FQ1216LME MK3 2. points the tveeprom module to the FQ1216LME MK3 entry for EEPROMs claiming FQ1216LME MK3 and MK5. 3. refactors some code in simple_post_tune() because a. I needed to set the Auxillary Byte, as did TUNER_LG_TDVS_H06XF, so I could set the TUA6030 TOP to external AGC per the datasheet. b. I wanted to do fast tuning while managing PLL phase noise, like the TUNER_MICROTUNE_4042FI5 was already doing. Hermann & Dmitri, I think what is done for setting the charge pump current for the TUNER_MICROTUNE_4042FI5 & FQ1216LME_MK3 in this patch is better than fixing the control byte to a constant value of 0xce. Comments? Regards, Andy Signed-off-by: Andy Walls --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -r e4b4291847b8 linux/drivers/media/common/tuners/tuner-simple.c --- a/linux/drivers/media/common/tuners/tuner-simple.c Tue Jun 02 19:40:03 2009 -0400 +++ b/linux/drivers/media/common/tuners/tuner-simple.c Fri Jun 05 17:32:49 2009 -0400 @@ -98,7 +98,6 @@ #define TUNER_SIGNAL 0x07 #define TUNER_STEREO 0x10 -#define TUNER_PLL_LOCKED 0x40 #define TUNER_STEREO_MK3 0x04 static DEFINE_MUTEX(tuner_simple_list_mutex); @@ -386,6 +385,7 @@ *cb |= 2; break; + case TUNER_PHILIPS_FQ1216LME_MK3: case TUNER_MICROTUNE_4042FI5: /* Set the charge pump for fast tuning */ *config |= TUNER_CHARGE_PUMP; @@ -423,77 +423,88 @@ return 0; } +static int simple_set_aux_byte(struct dvb_frontend *fe, u8 config, u8 aux) +{ + struct tuner_simple_priv *priv = fe->tuner_priv; + int rc; + u8 buffer[2]; + + buffer[0] = (config & ~0x38) | 0x18; + buffer[1] = aux; + + tuner_dbg("setting aux byte: 0x%02x 0x%02x\n", buffer[0], buffer[1]); + + rc = tuner_i2c_xfer_send(&priv->i2c_props, buffer, 2); + if (2 != rc) + tuner_warn("i2c i/o error: rc == %d (should be 2)\n", rc); + + return rc == 2 ? 0 : rc; +} + +static int simple_wait_pll_lock(struct dvb_frontend *fe, unsigned int timeout, + unsigned long interval) +{ + unsigned long expire; + int locked = 0; + + for (expire = jiffies + msecs_to_jiffies(timeout); + !time_after(jiffies, expire); + udelay(interval)) { + + if (tuner_islocked(tuner_read_status(fe))) { + locked = 1; + break; + } + } + return locked; +} + +static int simple_set_band_byte(struct dvb_frontend *fe, u8 config, u8 band) +{ + struct tuner_simple_priv *priv = fe->tuner_priv; + int rc; + u8 buffer[2]; + + buffer[0] = config; + buffer[1] = band; + + tuner_dbg("setting band byte: 0x%02x 0x%02x\n", buffer[0], buffer[1]); + + rc = tuner_i2c_xfer_send(&priv->i2c_props, buffer, 2); + if (2 != rc) + tuner_warn("i2c i/o error: rc == %d (should be 2)\n", rc); + + return rc == 2 ? 0 : rc; +} + static int simple_post_tune(struct dvb_frontend *fe, u8 *buffer, u16 div, u8 config, u8 cb) { struct tuner_simple_priv *priv = fe->tuner_priv; - int rc; switch (priv->type) { case TUNER_LG_TDVS_H06XF: - /* Set the Auxiliary Byte. */ -#if 0 - buffer[2] &= ~0x20; - buffer[2] |= 0x18; - buffer[3] = 0x20; - tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n", - buffer[0], buffer[1], buffer[2], buffer[3]); - - rc = tuner_i2c_xfer_send(&priv->i2c_props, buffer, 4); - if (4 != rc) - tuner_warn("i2c i/o error: rc == %d " - "(should be 4)\n", rc); -#else - buffer[0] = buffer[2]; - buffer[0] &= ~0x20; - buffer[0] |= 0x18; - buffer[1] = 0x20; - tuner_dbg("tv 0x%02x 0x%02x\n", buffer[0], buffer[1]); - - rc = tuner_i2c_xfer_send(&priv->i2c_props, buffer, 2); - if (2 != rc) - tuner_warn("i2c i/o error: rc == %d " - "(should be 2)\n", rc); -#endif + simple_set_aux_byte(fe, config, 0x20); + break; + case TUNER_PHILIPS_FQ1216LME_MK3: + simple_set_aux_byte(fe, config, 0x60); /* External AGC */ + /* + * "The loop must be phase-locked during at least 8 periods of + * the internal 7.8125 kHz reference-frequency (i.e. 1 msec) + * before the FL flag is internally set to 1." + * + * Wait 3 msec using a 128 usec poll interval + */ + simple_wait_pll_lock(fe, 3, 128); + /* Set the charge pump for optimized phase noise figure */ + simple_set_band_byte(fe, config & ~TUNER_CHARGE_PUMP, cb); break; case TUNER_MICROTUNE_4042FI5: - { - /* FIXME - this may also work for other tuners */ - unsigned long timeout = jiffies + msecs_to_jiffies(1); - u8 status_byte = 0; - - /* Wait until the PLL locks */ - for (;;) { - if (time_after(jiffies, timeout)) - return 0; - rc = tuner_i2c_xfer_recv(&priv->i2c_props, - &status_byte, 1); - if (1 != rc) { - tuner_warn("i2c i/o read error: rc == %d " - "(should be 1)\n", rc); - break; - } - if (status_byte & TUNER_PLL_LOCKED) - break; - udelay(10); - } - + simple_wait_pll_lock(fe, 1, 10); /* Set the charge pump for optimized phase noise figure */ - config &= ~TUNER_CHARGE_PUMP; - buffer[0] = (div>>8) & 0x7f; - buffer[1] = div & 0xff; - buffer[2] = config; - buffer[3] = cb; - tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n", - buffer[0], buffer[1], buffer[2], buffer[3]); - - rc = tuner_i2c_xfer_send(&priv->i2c_props, buffer, 4); - if (4 != rc) - tuner_warn("i2c i/o error: rc == %d " - "(should be 4)\n", rc); + simple_set_band_byte(fe, config & ~TUNER_CHARGE_PUMP, cb); break; } - } return 0; } @@ -526,6 +537,11 @@ case TUNER_THOMSON_DTT761X: buffer[3] = 0x39; break; + case TUNER_PHILIPS_FQ1216LME_MK3: + tuner_err("This tuner doesn't have FM\n"); + /* Set the low band for sanity, since it covers 88-108 MHz */ + buffer[3] = 0x01; + break; case TUNER_MICROTUNE_4049FM5: default: buffer[3] = 0xa4; diff -r e4b4291847b8 linux/drivers/media/common/tuners/tuner-types.c --- a/linux/drivers/media/common/tuners/tuner-types.c Tue Jun 02 19:40:03 2009 -0400 +++ b/linux/drivers/media/common/tuners/tuner-types.c Fri Jun 05 17:32:49 2009 -0400 @@ -1280,6 +1280,28 @@ }, }; +/* 80-89 */ +/* --------- TUNER_PHILIPS_FQ1216LME_MK3 -- active loopthrough, no FM ------- */ + +static struct tuner_params tuner_fq1216lme_mk3_params[] = { + { + .type = TUNER_PARAM_TYPE_PAL, + .ranges = tuner_fm1216me_mk3_pal_ranges, + .count = ARRAY_SIZE(tuner_fm1216me_mk3_pal_ranges), + .cb_first_if_lower_freq = 1, /* not specified, but safe to do */ + .has_tda9887 = 1, /* TDA9886 */ + .port1_active = 1, + .port2_active = 1, + .port2_invert_for_secam_lc = 1, + .default_top_low = 4, + .default_top_mid = 4, + .default_top_high = 4, + .default_top_secam_low = 4, + .default_top_secam_mid = 4, + .default_top_secam_high = 4, + }, +}; + /* --------------------------------------------------------------------- */ struct tunertype tuners[] = { @@ -1725,6 +1747,13 @@ .params = tuner_fm1216mk5_params, .count = ARRAY_SIZE(tuner_fm1216mk5_params), }, + + /* 80-89 */ + [TUNER_PHILIPS_FQ1216LME_MK3] = { /* PAL/SECAM, Loop-thru, no FM */ + .name = "Philips FQ1216LME MK3 PAL/SECAM w/active loopthrough", + .params = tuner_fq1216lme_mk3_params, + .count = ARRAY_SIZE(tuner_fq1216lme_mk3_params), + }, }; EXPORT_SYMBOL(tuners); diff -r e4b4291847b8 linux/drivers/media/video/tveeprom.c --- a/linux/drivers/media/video/tveeprom.c Tue Jun 02 19:40:03 2009 -0400 +++ b/linux/drivers/media/video/tveeprom.c Fri Jun 05 17:32:49 2009 -0400 @@ -185,7 +185,7 @@ { TUNER_ABSENT, "Silicon TDA8275C1 8290 FM"}, { TUNER_ABSENT, "Thompson DTT757"}, /* 80-89 */ - { TUNER_PHILIPS_FM1216ME_MK3, "Philips FQ1216LME MK3"}, + { TUNER_PHILIPS_FQ1216LME_MK3, "Philips FQ1216LME MK3"}, { TUNER_LG_PAL_NEW_TAPC, "LG TAPC G701D"}, { TUNER_LG_NTSC_NEW_TAPC, "LG TAPC H791F"}, { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MB 3"}, @@ -230,7 +230,7 @@ { TUNER_ABSENT, "Samsung THPD5222FG30A"}, /* 120-129 */ { TUNER_XC2028, "Xceive XC3028"}, - { TUNER_ABSENT, "Philips FQ1216LME MK5"}, + { TUNER_PHILIPS_FQ1216LME_MK3, "Philips FQ1216LME MK5"}, { TUNER_ABSENT, "Philips FQD1216LME"}, { TUNER_ABSENT, "Conexant CX24118A"}, { TUNER_ABSENT, "TCL DMF11WIP"}, diff -r e4b4291847b8 linux/include/media/tuner.h --- a/linux/include/media/tuner.h Tue Jun 02 19:40:03 2009 -0400 +++ b/linux/include/media/tuner.h Fri Jun 05 17:32:49 2009 -0400 @@ -125,6 +125,7 @@ #define TUNER_TCL_MF02GIP_5N 77 /* TCL MF02GIP_5N */ #define TUNER_PHILIPS_FMD1216MEX_MK3 78 #define TUNER_PHILIPS_FM1216MK5 79 +#define TUNER_PHILIPS_FQ1216LME_MK3 80 /* Active loopthrough, no FM */ /* tv card specific */ #define TDA9887_PRESENT (1<<0)