Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / media / dvb / frontends / tda1004x.h

diff --git a/drivers/media/dvb/frontends/tda1004x.h b/drivers/media/dvb/frontends/tda1004x.h
index c8e1d54..cc0c4af 100644 (file)
--- a/drivers/media/dvb/frontends/tda1004x.h
+++ b/drivers/media/dvb/frontends/tda1004x.h
@@ -26,6 +26,26 @@
 #include <linux/dvb/frontend.h>
 #include <linux/firmware.h>
 
+enum tda10046_xtal {
+       TDA10046_XTAL_4M,
+       TDA10046_XTAL_16M,
+};
+
+enum tda10046_agc {
+       TDA10046_AGC_DEFAULT,           /* original configuration */
+       TDA10046_AGC_IFO_AUTO_NEG,      /* IF AGC only, automatic, negtive */
+       TDA10046_AGC_IFO_AUTO_POS,      /* IF AGC only, automatic, positive */
+       TDA10046_AGC_TDA827X,           /* IF AGC only, special setup for tda827x */
+       TDA10046_AGC_TDA827X_GPL,       /* same as above, but GPIOs 0 */
+};
+
+enum tda10046_if {
+       TDA10046_FREQ_3617,             /* original config, 36,166 MHZ */
+       TDA10046_FREQ_3613,             /* 36,13 MHZ */
+       TDA10046_FREQ_045,              /* low IF, 4.0, 4.5, or 5.0 MHZ */
+       TDA10046_FREQ_052,              /* low IF, 5.1667 MHZ for tda9889 */
+};
+
 struct tda1004x_config
 {
        /* the demodulator's i2c address */
@@ -37,14 +57,22 @@ struct tda1004x_config
        /* Does the OCLK signal need inverted? */
        u8 invert_oclk;
 
-       /* value of N_I2C of the CONF_PLL3 register */
-       u8 n_i2c;
+       /* Xtal frequency, 4 or 16MHz*/
+       enum tda10046_xtal xtal_freq;
+
+       /* IF frequency */
+       enum tda10046_if if_freq;
+
+       /* AGC configuration */
+       enum tda10046_agc agc_config;
 
        /* PLL maintenance */
        int (*pll_init)(struct dvb_frontend* fe);
+       void (*pll_sleep)(struct dvb_frontend* fe);
        int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
 
        /* request firmware for device */
+       /* set this to NULL if the card has a firmware EEPROM */
        int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name);
 };