4 files changed, 21 insertions, 9 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 89f32107f46b..4399d1371cc1 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2543,11 +2543,12 @@ struct saa7134_board saa7134_boards[] = {
                 .name           = "Philips Tiger reference design",
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .tuner_config   = 0,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
-                .gpiomask       = 1 << 21,
+                .gpiomask       = 0x0200000,
                 .inputs = {{
                         .name   = name_tv,
                         .vmux   = 1,
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index cce8da6a4f94..62c107e7759d 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -370,6 +370,8 @@ static int attach_inform(struct i2c_client *client)
 
                 tun_setup.type = tuner;
                 tun_setup.addr = saa7134_boards[dev->board].tuner_addr;
+                tun_setup.config = saa7134_boards[dev->board].tuner_config;
+                tun_setup.gpio_func = (tuner_gpio_func_t) saa7134_set_gpio;
 
                 if ((tun_setup.addr == ADDR_UNSET)||(tun_setup.addr == client->addr)) {
 
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 7b5ae194bb11..303c0806df91 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -280,6 +280,7 @@ struct saa7134_board {
         unsigned char           radio_addr;
 
         unsigned int            tda9887_conf;
+        unsigned int            tuner_config;
 
         /* peripheral I/O */
         enum saa7134_video_out  video_out;
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 15dbc6bf42a7..522ec1c35b8c 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -144,7 +144,8 @@ static void set_freq(struct i2c_client *c, unsigned long freq)
 }
 
 static void set_type(struct i2c_client *c, unsigned int type,
-                     unsigned int new_mode_mask)
+                     unsigned int new_mode_mask, unsigned int new_config,
+                     tuner_gpio_func_t gpio_func)
 {
         struct tuner *t = i2c_get_clientdata(c);
         unsigned char buffer[4];
@@ -173,6 +174,11 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 microtune_init(c);
                 break;
         case TUNER_PHILIPS_TDA8290:
+                t->config = new_config;
+                if (gpio_func != NULL) {
+                        tuner_dbg("Defining GPIO function\n");
+                        t->gpio_func = gpio_func;
+                }
                 tda8290_init(c);
                 break;
         case TUNER_TEA5767:
@@ -234,10 +240,11 @@ static void set_addr(struct i2c_client *c, struct tuner_setup *tun_setup)
 
         tuner_dbg("set addr for type %i\n", t->type);
 
-        if ( t->type == UNSET && ((tun_setup->addr == ADDR_UNSET &&
-                (t->mode_mask & tun_setup->mode_mask)) ||
-                tun_setup->addr == c->addr)) {
-                        set_type(c, tun_setup->type, tun_setup->mode_mask);
+        if ( (t->type == UNSET && ((tun_setup->addr == ADDR_UNSET) &&
+                (t->mode_mask & tun_setup->mode_mask))) ||
+                (tun_setup->addr == c->addr)) {
+                        set_type(c, tun_setup->type, tun_setup->mode_mask,
+                                 tun_setup->config, tun_setup->gpio_func);
         }
 }
 
@@ -496,7 +503,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 register_client:
         tuner_info("chip found @ 0x%x (%s)\n", addr << 1, adap->name);
         i2c_attach_client (&t->i2c);
-        set_type (&t->i2c,t->type, t->mode_mask);
+        set_type (&t->i2c,t->type, t->mode_mask, t->config, t->gpio_func);
         return 0;
 }
 
@@ -576,10 +583,11 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         switch (cmd) {
         /* --- configuration --- */
         case TUNER_SET_TYPE_ADDR:
-                tuner_dbg ("Calling set_type_addr for type=%d, addr=0x%02x, mode=0x%02x\n",
+                tuner_dbg ("Calling set_type_addr for type=%d, addr=0x%02x, mode=0x%02x, config=0x%02x\n",
                                 ((struct tuner_setup *)arg)->type,
                                 ((struct tuner_setup *)arg)->addr,
-                                ((struct tuner_setup *)arg)->mode_mask);
+                                ((struct tuner_setup *)arg)->mode_mask,
+                                ((struct tuner_setup *)arg)->config);
 
                 set_addr(client, (struct tuner_setup *)arg);
                 break;