Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mv-sheeva.git] / drivers / media / common / tuners / tda18271.h

diff --git a/drivers/media/common/tuners/tda18271.h b/drivers/media/common/tuners/tda18271.h
index 53a9892a18d0fd6ca7c19bf0b1979a7a26155d4e..d7fcc36dc6e6a6e7e91fcc29764f91d51a5601c4 100644 (file)
--- a/drivers/media/common/tuners/tda18271.h
+++ b/drivers/media/common/tuners/tda18271.h
@@ -67,6 +67,23 @@ enum tda18271_i2c_gate {
        TDA18271_GATE_DIGITAL,
 };
 
+enum tda18271_output_options {
+       /* slave tuner output & loop thru & xtal oscillator always on */
+       TDA18271_OUTPUT_LT_XT_ON = 0,
+
+       /* slave tuner output loop thru off */
+       TDA18271_OUTPUT_LT_OFF = 1,
+
+       /* xtal oscillator off */
+       TDA18271_OUTPUT_XT_OFF = 2,
+};
+
+enum tda18271_small_i2c {
+       TDA18271_39_BYTE_CHUNK_INIT = 0,
+       TDA18271_16_BYTE_CHUNK_INIT = 1,
+       TDA18271_08_BYTE_CHUNK_INIT = 2,
+};
+
 struct tda18271_config {
        /* override default if freq / std settings (optional) */
        struct tda18271_std_map *std_map;
@@ -77,8 +94,14 @@ struct tda18271_config {
        /* use i2c gate provided by analog or digital demod */
        enum tda18271_i2c_gate gate;
 
+       /* output options that can be disabled */
+       enum tda18271_output_options output_opt;
+
        /* some i2c providers cant write all 39 registers at once */
-       unsigned int small_i2c:1;
+       enum tda18271_small_i2c small_i2c;
+
+       /* force rf tracking filter calibration on startup */
+       unsigned int rf_cal_on_startup:1;
 
        /* interface to saa713x / tda829x */
        unsigned int config;