From 045548622863911d1e32b2264efbf076d970ece4 Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Mon, 6 Apr 2009 22:45:20 +0400 Subject: Initial go at TT S2-1600 From: Manu Abraham Signed-off-by: Manu Abraham --- linux/drivers/media/dvb/frontends/stv090x.h | 109 ++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 linux/drivers/media/dvb/frontends/stv090x.h (limited to 'linux/drivers/media/dvb/frontends/stv090x.h') diff --git a/linux/drivers/media/dvb/frontends/stv090x.h b/linux/drivers/media/dvb/frontends/stv090x.h new file mode 100644 index 000000000..d1cc36985 --- /dev/null +++ b/linux/drivers/media/dvb/frontends/stv090x.h @@ -0,0 +1,109 @@ +/* + STV0900/0903 Multistandard Broadcast Frontend driver + Copyright (C) Manu Abraham + + Copyright (C) ST Microelectronics + + 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef __STV090x_H +#define __STV090x_H + +enum stv090x_demodulator { + STV090x_DEMODULATOR_0 = 1, + STV090x_DEMODULATOR_1 +}; + +enum stv090x_device { + STV0903 = 0, + STV0900, +}; + +enum stv090x_mode { + STV090x_DUAL = 0, + STV090x_SINGLE +}; + +enum stv090x_tsmode { + STV090x_TSMODE_SERIAL_PUNCTURED = 1, + STV090x_TSMODE_SERIAL_CONTINUOUS, + STV090x_TSMODE_PARALLEL_PUNCTURED, + STV090x_TSMODE_DVBCI +}; + +enum stv090x_clkmode { + STV090x_CLK_INT = 0, /* Clk i/p = CLKI */ + STV090x_CLK_EXT = 2 /* Clk i/p = XTALI */ +}; + +struct stv090x_config { + enum stv090x_device device; + enum stv090x_mode demod_mode; + enum stv090x_clkmode clk_mode; + + u32 xtal; /* default: 8000000 */ + u8 address; /* default: 0x68 */ + + u32 ref_clk; /* default: 16000000 FIXME to tuner config */ + + u8 ts1_mode; + u8 ts2_mode; +#if 0 + int (*tuner_init) (struct dvb_frontend *fe); + int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency); + int (*tuner_get_frequency) (struct dvb_frontend *fe, u32 *frequency); + int (*tuner_set_bandwidth) (struct dvb_frontend *fe, u32 bandwidth); + int (*tuner_get_bandwidth) (struct dvb_frontend *fe, u32 *bandwidth); + int (*tuner_set_refclock) (struct dvb_frontend *fe, u32 refclk); +#endif + + int (*tuner_init) (struct dvb_frontend *fe); + int (*tuner_set_mode) (struct dvb_frontend *fe, enum tuner_mode mode); + int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency); + int (*tuner_get_frequency) (struct dvb_frontend *fe, u32 *frequency); + int (*tuner_set_bandwidth) (struct dvb_frontend *fe, u32 bandwidth); + int (*tuner_get_bandwidth) (struct dvb_frontend *fe, u32 *bandwidth); + int (*tuner_set_bbgain) (struct dvb_frontend *fe, u32 gain); + int (*tuner_get_bbgain) (struct dvb_frontend *fe, u32 *gain); + int (*tuner_set_refclk) (struct dvb_frontend *fe, u32 refclk); + int (*tuner_get_status) (struct dvb_frontend *fe, u32 *status); +}; + +#if defined(CONFIG_DVB_STV090x) || (defined(CONFIG_DVB_STV090x_MODULE) && defined(MODULE)) + +extern struct dvb_frontend *stv090x_attach(const struct stv090x_config *config, + struct i2c_adapter *i2c, + enum stv090x_demodulator demod); +#else + +static inline struct dvb_frontend *stv090x_attach(const struct stv090x_config *config, + struct i2c_adapter *i2c, + enum stv090x_demodulator demod) +{ + printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); + return NULL; +} + +static inline struct dvb_frontend *stv090x_attach(const struct stv090x_config* config, + struct i2c_adapter *i2c, + enum stv090x_demodulator demod) +{ + printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); + return NULL; +} +#endif /* CONFIG_DVB_STV090x */ + +#endif /* __STV090x_H */ -- cgit v1.2.3 From 028d9a0c9dfc2039314063233c47fef4905d9071 Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Tue, 7 Apr 2009 12:19:54 +0400 Subject: * Reference clock was unused * Fix missing repeater level setup From: Manu Abraham Signed-off-by: Manu Abraham --- linux/drivers/media/dvb/frontends/stv090x.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'linux/drivers/media/dvb/frontends/stv090x.h') diff --git a/linux/drivers/media/dvb/frontends/stv090x.h b/linux/drivers/media/dvb/frontends/stv090x.h index d1cc36985..b75a66baf 100644 --- a/linux/drivers/media/dvb/frontends/stv090x.h +++ b/linux/drivers/media/dvb/frontends/stv090x.h @@ -49,6 +49,17 @@ enum stv090x_clkmode { STV090x_CLK_EXT = 2 /* Clk i/p = XTALI */ }; +enum stv090x_i2crpt { + STV090x_RPTLEVEL_256 = 0, + STV090x_RPTLEVEL_128 = 1, + STV090x_RPTLEVEL_64 = 2, + STV090x_RPTLEVEL_32 = 3, + STV090x_RPTLEVEL_16 = 4, + STV090x_RPTLEVEL_8 = 5, + STV090x_RPTLEVEL_4 = 6, + STV090x_RPTLEVEL_2 = 7, +}; + struct stv090x_config { enum stv090x_device device; enum stv090x_mode demod_mode; @@ -61,6 +72,8 @@ struct stv090x_config { u8 ts1_mode; u8 ts2_mode; + + enum stv090x_i2crpt repeater_level; #if 0 int (*tuner_init) (struct dvb_frontend *fe); int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency); -- cgit v1.2.3 From 34efc2efeab79b43139454c4daeef94ff1b69f2c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 24 Apr 2009 01:46:41 -0300 Subject: stv090x.h and stv6110x.h: Fix two trivial compilation breakage errors From: Mauro Carvalho Chehab /home/v4l/master/v4l/stv6110x.h:64: error: expected identifier or '(' before '{' token In file included from /home/v4l/master/v4l/budget.c:52: /home/v4l/master/v4l/stv090x.h:116: error: redefinition of 'stv090x_attach' /home/v4l/master/v4l/stv090x.h:108: error: previous definition of 'stv090x_attach' was here The first pne were due to an extra ';', and the other is due to a duplicated inline function declaration. This patch will need to be merged with the one that added those two headers at -git, to avoid breaking git bisect. CC: Manu Abraham Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/frontends/stv090x.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'linux/drivers/media/dvb/frontends/stv090x.h') diff --git a/linux/drivers/media/dvb/frontends/stv090x.h b/linux/drivers/media/dvb/frontends/stv090x.h index b75a66baf..5a567b3b4 100644 --- a/linux/drivers/media/dvb/frontends/stv090x.h +++ b/linux/drivers/media/dvb/frontends/stv090x.h @@ -109,14 +109,6 @@ static inline struct dvb_frontend *stv090x_attach(const struct stv090x_config *c printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); return NULL; } - -static inline struct dvb_frontend *stv090x_attach(const struct stv090x_config* config, - struct i2c_adapter *i2c, - enum stv090x_demodulator demod) -{ - printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); - return NULL; -} #endif /* CONFIG_DVB_STV090x */ #endif /* __STV090x_H */ -- cgit v1.2.3 From 3d2b4c935e8804f2ed232614079f41ab6360aad2 Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Sun, 3 May 2009 01:26:58 +0400 Subject: STV0900/STV0903: 1. Support Silicon Cut >= 3.0 2. Remove support for obsolete cuts: 1.0. 1.1. 1.2 3. Try to catch more error cases Driver doesn't now attach to obsolete silcon cuts, It just simply quits. Results in code simplification, with removal of the obsolete cuts. From: Manu Abraham Signed-off-by: Manu Abraham --- linux/drivers/media/dvb/frontends/stv090x.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'linux/drivers/media/dvb/frontends/stv090x.h') diff --git a/linux/drivers/media/dvb/frontends/stv090x.h b/linux/drivers/media/dvb/frontends/stv090x.h index 5a567b3b4..e968c98bb 100644 --- a/linux/drivers/media/dvb/frontends/stv090x.h +++ b/linux/drivers/media/dvb/frontends/stv090x.h @@ -74,14 +74,6 @@ struct stv090x_config { u8 ts2_mode; enum stv090x_i2crpt repeater_level; -#if 0 - int (*tuner_init) (struct dvb_frontend *fe); - int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency); - int (*tuner_get_frequency) (struct dvb_frontend *fe, u32 *frequency); - int (*tuner_set_bandwidth) (struct dvb_frontend *fe, u32 bandwidth); - int (*tuner_get_bandwidth) (struct dvb_frontend *fe, u32 *bandwidth); - int (*tuner_set_refclock) (struct dvb_frontend *fe, u32 refclk); -#endif int (*tuner_init) (struct dvb_frontend *fe); int (*tuner_set_mode) (struct dvb_frontend *fe, enum tuner_mode mode); -- cgit v1.2.3