1 files changed, 50 insertions, 4 deletions

diff --git a/drivers/media/dvb/frontends/tda1004x.h b/drivers/media/dvb/frontends/tda1004x.h
index ec502d71b83c..abae84350142 100644
--- a/drivers/media/dvb/frontends/tda1004x.h
+++ b/drivers/media/dvb/frontends/tda1004x.h
@@ -35,9 +35,23 @@ 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_GP11,      /* IF AGC only, special setup for tda827x */
-        TDA10046_AGC_TDA827X_GP00,      /* same as above, but GPIOs 0 */
-        TDA10046_AGC_TDA827X_GP01,      /* same as above, but GPIO3=0 GPIO1=1*/
+        TDA10046_AGC_TDA827X,           /* IF AGC only, special setup for tda827x */
+};
+
+/* Many (hybrid) boards use GPIO 1 and 3
+        GPIO1   analog - dvb switch
+        GPIO3   firmware eeprom address switch
+*/
+enum tda10046_gpio {
+        TDA10046_GPTRI  = 0x00,         /* All GPIOs tristate */
+        TDA10046_GP00   = 0x40,         /* GPIO3=0, GPIO1=0 */
+        TDA10046_GP01   = 0x42,         /* GPIO3=0, GPIO1=1 */
+        TDA10046_GP10   = 0x48,         /* GPIO3=1, GPIO1=0 */
+        TDA10046_GP11   = 0x4a,         /* GPIO3=1, GPIO1=1 */
+        TDA10046_GP00_I = 0x80,         /* GPIO3=0, GPIO1=0, invert in sleep mode*/
+        TDA10046_GP01_I = 0x82,         /* GPIO3=0, GPIO1=1, invert in sleep mode */
+        TDA10046_GP10_I = 0x88,         /* GPIO3=1, GPIO1=0, invert in sleep mode */
+        TDA10046_GP11_I = 0x8a,         /* GPIO3=1, GPIO1=1, invert in sleep mode */
 };
 
 enum tda10046_if {
@@ -47,6 +61,11 @@ enum tda10046_if {
         TDA10046_FREQ_052,              /* low IF, 5.1667 MHZ for tda9889 */
 };
 
+enum tda10046_tsout {
+        TDA10046_TS_PARALLEL  = 0x00,   /* parallel transport stream, default */
+        TDA10046_TS_SERIAL    = 0x01,   /* serial transport stream */
+};
+
 struct tda1004x_config
 {
         /* the demodulator's i2c address */
@@ -58,6 +77,9 @@ struct tda1004x_config
         /* Does the OCLK signal need inverted? */
         u8 invert_oclk;
 
+        /* parallel or serial transport stream */
+        enum tda10046_tsout ts_mode;
+
         /* Xtal frequency, 4 or 16MHz*/
         enum tda10046_xtal xtal_freq;
 
@@ -67,11 +89,35 @@ struct tda1004x_config
         /* AGC configuration */
         enum tda10046_agc agc_config;
 
+        /* setting of GPIO1 and 3 */
+        enum tda10046_gpio gpio_config;
+
+        /* slave address and configuration of the tuner */
+        u8 tuner_address;
+        u8 tuner_config;
+        u8 antenna_switch;
+
+        /* if the board uses another I2c Bridge (tda8290), its address */
+        u8 i2c_gate;
+
         /* 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);
 };
 
+enum tda1004x_demod {
+        TDA1004X_DEMOD_TDA10045,
+        TDA1004X_DEMOD_TDA10046,
+};
+
+struct tda1004x_state {
+        struct i2c_adapter* i2c;
+        const struct tda1004x_config* config;
+        struct dvb_frontend frontend;
+
+        /* private demod data */
+        enum tda1004x_demod demod_type;
+};
+
 #if defined(CONFIG_DVB_TDA1004X) || (defined(CONFIG_DVB_TDA1004X_MODULE) && defined(MODULE))
 extern struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
                                             struct i2c_adapter* i2c);