1 files changed, 23 insertions, 2 deletions

diff --git a/drivers/media/dvb/frontends/tda18271.h b/drivers/media/dvb/frontends/tda18271.h
index 24b0e35a2ab3..0e7af8d05a38 100644
--- a/drivers/media/dvb/frontends/tda18271.h
+++ b/drivers/media/dvb/frontends/tda18271.h
@@ -26,7 +26,17 @@
 
 struct tda18271_std_map_item {
         u16 if_freq;
-        u8 std_bits;
+
+        /* EP3[4:3] */
+        unsigned int agc_mode:2;
+        /* EP3[2:0] */
+        unsigned int std:3;
+        /* EP4[7] */
+        unsigned int fm_rfn:1;
+        /* EP4[4:2] */
+        unsigned int if_lvl:3;
+        /* EB22[6:0] */
+        unsigned int rfagc_top:7;
 };
 
 struct tda18271_std_map {
@@ -46,6 +56,11 @@ struct tda18271_std_map {
         struct tda18271_std_map_item qam_8;
 };
 
+enum tda18271_role {
+        TDA18271_MASTER = 0,
+        TDA18271_SLAVE,
+};
+
 enum tda18271_i2c_gate {
         TDA18271_GATE_AUTO = 0,
         TDA18271_GATE_ANALOG,
@@ -56,8 +71,14 @@ struct tda18271_config {
         /* override default if freq / std settings (optional) */
         struct tda18271_std_map *std_map;
 
+        /* master / slave tuner: master uses main pll, slave uses cal pll */
+        enum tda18271_role role;
+
         /* use i2c gate provided by analog or digital demod */
         enum tda18271_i2c_gate gate;
+
+        /* some i2c providers cant write all 39 registers at once */
+        unsigned int small_i2c:1;
 };
 
 #if defined(CONFIG_DVB_TDA18271) || (defined(CONFIG_DVB_TDA18271_MODULE) && defined(MODULE))
@@ -70,7 +91,7 @@ static inline struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe,
                                                    struct i2c_adapter *i2c,
                                                    struct tda18271_config *cfg)
 {
-        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
 #endif