Re: [PATCH 09/12] [media] tsin: c8sectpfe: Add support for various ST NIM cards.

Peter Griffin
2015-07-30T09:43:52Z

Hi Mauro,

On Wed, 22 Jul 2015, Mauro Carvalho Chehab wrote:

> Em Wed, 24 Jun 2015 16:11:07 +0100
> Peter Griffin <peter.griffin@linaro.org> escreveu:
>
> > This patch adds support for the following 3 NIM cards: -
> > 1) STV0367-NIM (stv0367 demod with Thompson PLL)
> > 2) B2100A (2x stv0367 demods & 2x NXP tda18212 tuners)
> > 3) STV0903-6110NIM (stv0903 demod + 6110 tuner, lnb24)
> >
> > Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> > ---
> > drivers/media/tsin/c8sectpfe/c8sectpfe-dvb.c | 296 +++++++++++++++++++++++++++
> > drivers/media/tsin/c8sectpfe/c8sectpfe-dvb.h | 20 ++
> > 2 files changed, 316 insertions(+)
> > create mode 100644 drivers/media/tsin/c8sectpfe/c8sectpfe-dvb.c
> > create mode 100644 drivers/media/tsin/c8sectpfe/c8sectpfe-dvb.h
> >
> > diff --git a/drivers/media/tsin/c8sectpfe/c8sectpfe-dvb.c b/drivers/media/tsin/c8sectpfe/c8sectpfe-dvb.c
> > new file mode 100644
> > index 0000000..5c4ecb4
> > --- /dev/null
> > +++ b/drivers/media/tsin/c8sectpfe/c8sectpfe-dvb.c
> > @@ -0,0 +1,296 @@
> > +/*
> > + * c8sectpfe-dvb.c - C8SECTPFE STi DVB driver
> > + *
> > + * Copyright (c) STMicroelectronics 2015
> > + *
> > + * Author Peter Griffin <peter.griffin@linaro.org>
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation; either version 2 of the License, or
> > + * (at your option) any later version.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + *
> > + * GNU General Public License for more details.
> > + */
> > +#include <linux/completion.h>
> > +#include <linux/delay.h>
> > +#include <linux/i2c.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/version.h>
> > +
> > +#include <dt-bindings/media/c8sectpfe.h>
> > +
> > +#include "c8sectpfe-common.h"
> > +#include "c8sectpfe-core.h"
> > +#include "c8sectpfe-dvb.h"
> > +
> > +#include "dvb-pll.h"
> > +#include "lnbh24.h"
> > +#include "stv0367.h"
> > +#include "stv0367_priv.h"
> > +#include "stv6110x.h"
> > +#include "stv090x.h"
> > +#include "tda18212.h"
> > +
> > +static inline const char *dvb_card_str(unsigned int c)
> > +{
> > + switch (c) {
> > + case STV0367_PLL_BOARD_NIMA: return "STV0367_PLL_BOARD_NIMA";
> > + case STV0367_PLL_BOARD_NIMB: return "STV0367_PLL_BOARD_NIMB";
> > + case STV0367_TDA18212_NIMA_1: return "STV0367_TDA18212_NIMA_1";
> > + case STV0367_TDA18212_NIMA_2: return "STV0367_TDA18212_NIMA_2";
> > + case STV0367_TDA18212_NIMB_1: return "STV0367_TDA18212_NIMB_1";
> > + case STV0367_TDA18212_NIMB_2: return "STV0367_TDA18212_NIMB_2";
> > + case STV0903_6110_LNB24_NIMA: return "STV0903_6110_LNB24_NIMA";
> > + case STV0903_6110_LNB24_NIMB: return "STV0903_6110_LNB24_NIMB";
> > + default: return "unknown dvb frontend card";
> > + }
> > +}
> > +
> > +static struct stv090x_config stv090x_config = {
> > + .device = STV0903,
> > + .demod_mode = STV090x_SINGLE,
> > + .clk_mode = STV090x_CLK_EXT,
> > + .xtal = 16000000,
> > + .address = 0x69,
> > +
> > + .ts1_mode = STV090x_TSMODE_SERIAL_CONTINUOUS,
> > + .ts2_mode = STV090x_TSMODE_SERIAL_CONTINUOUS,
> > +
> > + .repeater_level = STV090x_RPTLEVEL_64,
> > +
> > + .tuner_init = NULL,
> > + .tuner_set_mode = NULL,
> > + .tuner_set_frequency = NULL,
> > + .tuner_get_frequency = NULL,
> > + .tuner_set_bandwidth = NULL,
> > + .tuner_get_bandwidth = NULL,
> > + .tuner_set_bbgain = NULL,
> > + .tuner_get_bbgain = NULL,
> > + .tuner_set_refclk = NULL,
> > + .tuner_get_status = NULL,
> > +};
> > +
> > +static struct stv6110x_config stv6110x_config = {
> > + .addr = 0x60,
> > + .refclk = 16000000,
> > +};
> > +
> > +#define NIMA 0
> > +#define NIMB 1
> > +
> > +static struct stv0367_config stv0367_pll_config[] = {
> > + {
> > + .demod_address = 0x1c,
> > + .xtal = 27000000,
> > + .if_khz = 36166,
> > + .if_iq_mode = FE_TER_NORMAL_IF_TUNER,
> > + .ts_mode = STV0367_SERIAL_PUNCT_CLOCK,
> > + .clk_pol = STV0367_CLOCKPOLARITY_DEFAULT,
> > + }, {
> > + .demod_address = 0x1d,
> > + .xtal = 27000000,
> > + .if_khz = 36166,
> > + .if_iq_mode = FE_TER_NORMAL_IF_TUNER,
> > + .ts_mode = STV0367_SERIAL_PUNCT_CLOCK,
> > + .clk_pol = STV0367_CLOCKPOLARITY_DEFAULT,
> > + },
> > +};
> > +
> > +static struct stv0367_config stv0367_tda18212_config[] = {
> > + {
> > + .demod_address = 0x1c,
> > + .xtal = 16000000,
> > + .if_khz = 4500,
> > + .if_iq_mode = FE_TER_NORMAL_IF_TUNER,
> > + .ts_mode = STV0367_SERIAL_PUNCT_CLOCK,
> > + .clk_pol = STV0367_CLOCKPOLARITY_DEFAULT,
> > + }, {
> > + .demod_address = 0x1d,
> > + .xtal = 16000000,
> > + .if_khz = 4500,
> > + .if_iq_mode = FE_TER_NORMAL_IF_TUNER,
> > + .ts_mode = STV0367_SERIAL_PUNCT_CLOCK,
> > + .clk_pol = STV0367_CLOCKPOLARITY_DEFAULT,
> > + }, {
> > + .demod_address = 0x1e,
> > + .xtal = 16000000,
> > + .if_khz = 4500,
> > + .if_iq_mode = FE_TER_NORMAL_IF_TUNER,
> > + .ts_mode = STV0367_SERIAL_PUNCT_CLOCK,
> > + .clk_pol = STV0367_CLOCKPOLARITY_DEFAULT,
> > + },
> > +};
> > +
> > +static struct tda18212_config tda18212_conf = {
> > + .if_dvbt_6 = 4150,
> > + .if_dvbt_7 = 4150,
> > + .if_dvbt_8 = 4500,
> > + .if_dvbc = 5000,
> > +};
> > +
> > +int c8sectpfe_frontend_attach(struct dvb_frontend **fe,
> > + struct c8sectpfe *c8sectpfe,
> > + struct channel_info *tsin, int chan_num)
> > +{
> > + struct tda18212_config *tda18212;
> > + struct stv6110x_devctl *fe2;
> > + struct i2c_client *client;
> > + struct i2c_board_info tda18212_info = {
> > + .type = "tda18212",
> > + .addr = 0x60,
> > + };
> > +
> > + BUG_ON(!tsin);
>
> Just return an error if !tsin.

Ok will fix in V2

regards,

Peter.