V4L/DVB (5313): Added a config entry and a gpio function pointer to tuner struct

[sfrench/cifs-2.6.git] / drivers / media / video / tuner-core.c

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 705daaa2a4ff82a649c19affa1f7c02a2b9c3152..522ec1c35b8c8d86ed2befc049fa83a9e58e3f39 100644 (file)
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -7,7 +7,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
@@ -145,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];
@@ -174,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:
@@ -235,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);
        }
 }
 
@@ -267,6 +273,10 @@ static int tuner_fixup_std(struct tuner *t)
 {
        if ((t->std & V4L2_STD_PAL) == V4L2_STD_PAL) {
                switch (pal[0]) {
+               case '6':
+                       tuner_dbg ("insmod fixup: PAL => PAL-60\n");
+                       t->std = V4L2_STD_PAL_60;
+                       break;
                case 'b':
                case 'B':
                case 'g':
@@ -493,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;
 }
 
@@ -573,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;
@@ -801,9 +812,8 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
        return 0;
 }
 
-static int tuner_suspend(struct device *dev, pm_message_t state)
+static int tuner_suspend(struct i2c_client *c, pm_message_t state)
 {
-       struct i2c_client *c = container_of (dev, struct i2c_client, dev);
        struct tuner *t = i2c_get_clientdata (c);
 
        tuner_dbg ("suspend\n");
@@ -811,9 +821,8 @@ static int tuner_suspend(struct device *dev, pm_message_t state)
        return 0;
 }
 
-static int tuner_resume(struct device *dev)
+static int tuner_resume(struct i2c_client *c)
 {
-       struct i2c_client *c = container_of (dev, struct i2c_client, dev);
        struct tuner *t = i2c_get_clientdata (c);
 
        tuner_dbg ("resume\n");
@@ -834,10 +843,10 @@ static struct i2c_driver driver = {
        .attach_adapter = tuner_probe,
        .detach_client = tuner_detach,
        .command = tuner_command,
+       .suspend = tuner_suspend,
+       .resume  = tuner_resume,
        .driver = {
                .name    = "tuner",
-               .suspend = tuner_suspend,
-               .resume  = tuner_resume,
        },
 };
 static struct i2c_client client_template = {