From patchwork Wed Jul 6 22:57:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Alberto Reguero X-Patchwork-Id: 951522 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p66MvPYb014118 for ; Wed, 6 Jul 2011 22:57:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753362Ab1GFW5W (ORCPT ); Wed, 6 Jul 2011 18:57:22 -0400 Received: from impaqm4.telefonica.net ([213.4.138.20]:40484 "EHLO telefonica.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753344Ab1GFW5W (ORCPT ); Wed, 6 Jul 2011 18:57:22 -0400 Received: from IMPmailhost4.adm.correo ([10.20.102.125]) by IMPaqm4.telefonica.net with bizsmtp id 4mtF1h01K2iL0W23QmxHJ1; Thu, 07 Jul 2011 00:57:17 +0200 Received: from jar7.dominio ([2.137.171.93]) by IMPmailhost4.adm.correo with BIZ IMP id 4mxF1h00F21Fa6y1kmxGic; Thu, 07 Jul 2011 00:57:17 +0200 X-Brightmail-Tracker: AAAAAA== X-original-sender: jareguero@telefonica.net From: Jose Alberto Reguero To: linux-media@vger.kernel.org Subject: [PATCH] add support for the dvb-t part of CT-3650 v2 Date: Thu, 7 Jul 2011 00:57:04 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.38.7-30.fc15.x86_64; KDE/4.6.3; x86_64; ; ) References: <201106070205.08118.jareguero@telefonica.net> In-Reply-To: <201106070205.08118.jareguero@telefonica.net> MIME-Version: 1.0 Message-Id: <201107070057.06317.jareguero@telefonica.net> 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.6 (demeter2.kernel.org [140.211.167.43]); Wed, 06 Jul 2011 22:57:25 +0000 (UTC) This patch add suport for the dvb-t part of CT-3650. Jose Alberto Signed-off-by: Jose Alberto Reguero diff -ur linux/drivers/media/common/tuners/tda827x.c linux.new/drivers/media/common/tuners/tda827x.c --- linux/drivers/media/common/tuners/tda827x.c 2010-07-03 23:22:08.000000000 +0200 +++ linux.new/drivers/media/common/tuners/tda827x.c 2011-07-04 12:00:29.931561053 +0200 @@ -135,14 +135,29 @@ static int tuner_transfer(struct dvb_frontend *fe, struct i2c_msg *msg, - const int size) + int size) { int rc; struct tda827x_priv *priv = fe->tuner_priv; + struct i2c_msg msgr[2]; if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); - rc = i2c_transfer(priv->i2c_adap, msg, size); + if (priv->cfg->i2cr && (msg->flags == I2C_M_RD)) { + msgr[0].addr = msg->addr; + msgr[0].flags = 0; + msgr[0].len = msg->len - 1; + msgr[0].buf = msg->buf; + msgr[1].addr = msg->addr; + msgr[1].flags = I2C_M_RD; + msgr[1].len = 1; + msgr[1].buf = msg->buf; + size = 2; + rc = i2c_transfer(priv->i2c_adap, msgr, size); + msg->buf[msg->len - 1] = msgr[1].buf[0]; + } else { + rc = i2c_transfer(priv->i2c_adap, msg, size); + } if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); @@ -540,7 +555,7 @@ if_freq = 5000000; break; } - tuner_freq = params->frequency + if_freq; + tuner_freq = params->frequency; if (fe->ops.info.type == FE_QAM) { dprintk("%s select tda827xa_dvbc\n", __func__); @@ -554,6 +569,8 @@ i++; } + tuner_freq += if_freq; + N = ((tuner_freq + 31250) / 62500) << frequency_map[i].spd; buf[0] = 0; // subaddress buf[1] = N >> 8; diff -ur linux/drivers/media/common/tuners/tda827x.h linux.new/drivers/media/common/tuners/tda827x.h --- linux/drivers/media/common/tuners/tda827x.h 2010-07-03 23:22:08.000000000 +0200 +++ linux.new/drivers/media/common/tuners/tda827x.h 2011-05-21 22:48:31.484340005 +0200 @@ -38,6 +38,8 @@ int switch_addr; void (*agcf)(struct dvb_frontend *fe); + + u8 i2cr; }; diff -ur linux/drivers/media/dvb/dvb-usb/ttusb2.c linux.new/drivers/media/dvb/dvb-usb/ttusb2.c --- linux/drivers/media/dvb/dvb-usb/ttusb2.c 2011-01-10 16:24:45.000000000 +0100 +++ linux.new/drivers/media/dvb/dvb-usb/ttusb2.c 2011-07-05 12:35:51.842182196 +0200 @@ -30,6 +30,7 @@ #include "tda826x.h" #include "tda10086.h" #include "tda1002x.h" +#include "tda10048.h" #include "tda827x.h" #include "lnbp21.h" @@ -44,6 +45,7 @@ struct ttusb2_state { u8 id; u16 last_rc_key; + struct dvb_frontend *fe; }; static int ttusb2_msg(struct dvb_usb_device *d, u8 cmd, @@ -190,6 +190,22 @@ .deltaf = 0xa511, }; +static struct tda10048_config tda10048_config = { + .demod_address = 0x10 >> 1, + .output_mode = TDA10048_PARALLEL_OUTPUT, + .inversion = TDA10048_INVERSION_ON, + .dtv6_if_freq_khz = TDA10048_IF_4000, + .dtv7_if_freq_khz = TDA10048_IF_4500, + .dtv8_if_freq_khz = TDA10048_IF_5000, + .clk_freq_khz = TDA10048_CLK_16000, + .no_firmware = 1, +}; + +static struct tda827x_config tda827x_config = { + .i2cr = 1, + .config = 0, +}; + static int ttusb2_frontend_tda10086_attach(struct dvb_usb_adapter *adap) { if (usb_set_interface(adap->dev->udev,0,3) < 0) @@ -205,18 +221,32 @@ static int ttusb2_frontend_tda10023_attach(struct dvb_usb_adapter *adap) { + + struct ttusb2_state *state; if (usb_set_interface(adap->dev->udev, 0, 3) < 0) err("set interface to alts=3 failed"); + state = (struct ttusb2_state *)adap->dev->priv; if ((adap->fe = dvb_attach(tda10023_attach, &tda10023_config, &adap->dev->i2c_adap, 0x48)) == NULL) { deb_info("TDA10023 attach failed\n"); return -ENODEV; } + adap->fe->id = 1; + tda10048_config.fe = adap->fe; + if ((state->fe = dvb_attach(tda10048_attach, &tda10048_config, &adap->dev->i2c_adap)) == NULL) { + deb_info("TDA10048 attach failed\n"); + return -ENODEV; + } + dvb_register_frontend(&adap->dvb_adap, state->fe); + if (dvb_attach(tda827x_attach, state->fe, 0x61, &adap->dev->i2c_adap, &tda827x_config) == NULL) { + printk(KERN_ERR "%s: No tda827x found!\n", __func__); + return -ENODEV; + } return 0; } static int ttusb2_tuner_tda827x_attach(struct dvb_usb_adapter *adap) { - if (dvb_attach(tda827x_attach, adap->fe, 0x61, &adap->dev->i2c_adap, NULL) == NULL) { + if (dvb_attach(tda827x_attach, adap->fe, 0x61, &adap->dev->i2c_adap, &tda827x_config) == NULL) { printk(KERN_ERR "%s: No tda827x found!\n", __func__); return -ENODEV; } @@ -242,6 +272,19 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400; static struct dvb_usb_device_properties ttusb2_properties_ct3650; +static void ttusb2_usb_disconnect (struct usb_interface *intf) +{ + struct dvb_usb_device *d = usb_get_intfdata (intf); + struct ttusb2_state * state; + + state = (struct ttusb2_state *)d->priv; + if (state->fe) { + dvb_unregister_frontend(state->fe); + dvb_frontend_detach(state->fe); + } + dvb_usb_device_exit (intf); +} + static int ttusb2_probe(struct usb_interface *intf, const struct usb_device_id *id) { @@ -422,7 +465,7 @@ static struct usb_driver ttusb2_driver = { .name = "dvb_usb_ttusb2", .probe = ttusb2_probe, - .disconnect = dvb_usb_device_exit, + .disconnect = ttusb2_usb_disconnect, .id_table = ttusb2_table, }; diff -ur linux/drivers/media/dvb/frontends/Makefile linux.new/drivers/media/dvb/frontends/Makefile --- linux/drivers/media/dvb/frontends/Makefile 2011-05-06 05:45:29.000000000 +0200 +++ linux.new/drivers/media/dvb/frontends/Makefile 2011-07-05 01:36:24.621564185 +0200 @@ -4,6 +4,7 @@ EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -Idrivers/media/common/tuners/ +EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-usb/ stb0899-objs = stb0899_drv.o stb0899_algo.o stv0900-objs = stv0900_core.o stv0900_sw.o diff -ur linux/drivers/media/dvb/frontends/tda10048.c linux.new/drivers/media/dvb/frontends/tda10048.c --- linux/drivers/media/dvb/frontends/tda10048.c 2010-10-25 01:34:58.000000000 +0200 +++ linux.new/drivers/media/dvb/frontends/tda10048.c 2011-07-05 01:57:47.758466025 +0200 @@ -30,6 +30,7 @@ #include "dvb_frontend.h" #include "dvb_math.h" #include "tda10048.h" +#include "dvb-usb.h" #define TDA10048_DEFAULT_FIRMWARE "dvb-fe-tda10048-1.0.fw" #define TDA10048_DEFAULT_FIRMWARE_SIZE 24878 @@ -214,6 +215,8 @@ { TDA10048_CLK_16000, TDA10048_IF_3800, 10, 3, 0 }, { TDA10048_CLK_16000, TDA10048_IF_4000, 10, 3, 0 }, { TDA10048_CLK_16000, TDA10048_IF_4300, 10, 3, 0 }, + { TDA10048_CLK_16000, TDA10048_IF_4500, 5, 3, 0 }, + { TDA10048_CLK_16000, TDA10048_IF_5000, 5, 3, 0 }, { TDA10048_CLK_16000, TDA10048_IF_36130, 10, 3, 0 }, }; @@ -429,6 +432,19 @@ return 0; } +static int tda10048_set_pll(struct dvb_frontend *fe) +{ + struct tda10048_state *state = fe->demodulator_priv; + + dprintk(1, "%s()\n", __func__); + + tda10048_writereg(state, TDA10048_CONF_PLL1, 0x0f); + tda10048_writereg(state, TDA10048_CONF_PLL2, (u8)(state->pll_mfactor)); + tda10048_writereg(state, TDA10048_CONF_PLL3, tda10048_readreg(state, TDA10048_CONF_PLL3) | ((u8)(state->pll_nfactor) | 0x40)); + + return 0; +} + static int tda10048_set_if(struct dvb_frontend *fe, enum fe_bandwidth bw) { struct tda10048_state *state = fe->demodulator_priv; @@ -478,6 +494,9 @@ dprintk(1, "- pll_nfactor = %d\n", state->pll_nfactor); dprintk(1, "- pll_pfactor = %d\n", state->pll_pfactor); + /* Set the pll registers */ + tda10048_set_pll(fe); + /* Calculate the sample frequency */ state->sample_freq = state->xtal_hz * (state->pll_mfactor + 45); state->sample_freq /= (state->pll_nfactor + 1); @@ -710,12 +729,16 @@ if (config->disable_gate_access) return 0; - if (enable) - return tda10048_writereg(state, TDA10048_CONF_C4_1, - tda10048_readreg(state, TDA10048_CONF_C4_1) | 0x02); - else - return tda10048_writereg(state, TDA10048_CONF_C4_1, - tda10048_readreg(state, TDA10048_CONF_C4_1) & 0xfd); + if (config->fe && config->fe->ops.i2c_gate_ctrl) { + return config->fe->ops.i2c_gate_ctrl(config->fe, enable); + } else { + if (enable) + return tda10048_writereg(state, TDA10048_CONF_C4_1, + tda10048_readreg(state, TDA10048_CONF_C4_1) | 0x02); + else + return tda10048_writereg(state, TDA10048_CONF_C4_1, + tda10048_readreg(state, TDA10048_CONF_C4_1) & 0xfd); + } } static int tda10048_output_mode(struct dvb_frontend *fe, int serial) @@ -772,20 +795,45 @@ return 0; } +static int tda10048_sleep(struct dvb_frontend *fe) +{ + struct tda10048_state *state = fe->demodulator_priv; + struct tda10048_config *config = &state->config; + struct dvb_usb_adapter *adap; + + dprintk(1, "%s()\n", __func__); + + if (config->fe) { + adap = fe->dvb->priv; + if (adap->dev->props.power_ctrl) + adap->dev->props.power_ctrl(adap->dev, 0); + } + + return 0; +} + /* Establish sane defaults and load firmware. */ static int tda10048_init(struct dvb_frontend *fe) { struct tda10048_state *state = fe->demodulator_priv; struct tda10048_config *config = &state->config; + struct dvb_usb_adapter *adap; int ret = 0, i; dprintk(1, "%s()\n", __func__); + if (config->fe) { + adap = fe->dvb->priv; + if (adap->dev->props.power_ctrl) + adap->dev->props.power_ctrl(adap->dev, 1); + } + + /* Apply register defaults */ for (i = 0; i < ARRAY_SIZE(init_tab); i++) tda10048_writereg(state, init_tab[i].reg, init_tab[i].data); - if (state->fwloaded == 0) + if ((state->fwloaded == 0) && (!config->no_firmware)) ret = tda10048_firmware_upload(fe); /* Set either serial or parallel */ @@ -1174,6 +1222,7 @@ .release = tda10048_release, .init = tda10048_init, + .sleep = tda10048_sleep, .i2c_gate_ctrl = tda10048_i2c_gate_ctrl, .set_frontend = tda10048_set_frontend, .get_frontend = tda10048_get_frontend, diff -ur linux/drivers/media/dvb/frontends/tda10048.h linux.new/drivers/media/dvb/frontends/tda10048.h --- linux/drivers/media/dvb/frontends/tda10048.h 2010-07-03 23:22:08.000000000 +0200 +++ linux.new/drivers/media/dvb/frontends/tda10048.h 2011-07-05 02:02:42.775466043 +0200 @@ -51,6 +51,7 @@ #define TDA10048_IF_4300 4300 #define TDA10048_IF_4500 4500 #define TDA10048_IF_4750 4750 +#define TDA10048_IF_5000 5000 #define TDA10048_IF_36130 36130 u16 dtv6_if_freq_khz; u16 dtv7_if_freq_khz; @@ -62,6 +63,10 @@ /* Disable I2C gate access */ u8 disable_gate_access; + + u8 no_firmware; + + struct dvb_frontend *fe; }; #if defined(CONFIG_DVB_TDA10048) || \