5 files changed, 180 insertions, 105 deletions

diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 1536ab5a4a8d..b9c3ba51fb86 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -96,12 +96,10 @@ static unsigned int pll[BTTV_MAX]    = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
 static unsigned int tuner[BTTV_MAX]  = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
 static unsigned int svhs[BTTV_MAX]   = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
 static unsigned int remote[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
+static unsigned int audiodev[BTTV_MAX];
+static unsigned int saa6588[BTTV_MAX];
 static struct bttv  *master[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = NULL };
-#ifdef MODULE
-static unsigned int autoload = 1;
-#else
-static unsigned int autoload;
-#endif
+static unsigned int autoload = UNSET;
 static unsigned int gpiomask = UNSET;
 static unsigned int audioall = UNSET;
 static unsigned int audiomux[5] = { [ 0 ... 4 ] = UNSET };
@@ -120,6 +118,7 @@ module_param_array(pll,      int, NULL, 0444);
 module_param_array(tuner,    int, NULL, 0444);
 module_param_array(svhs,     int, NULL, 0444);
 module_param_array(remote,   int, NULL, 0444);
+module_param_array(audiodev, int, NULL, 0444);
 module_param_array(audiomux, int, NULL, 0444);
 
 MODULE_PARM_DESC(triton1,"set ETBF pci config bit "
@@ -130,7 +129,14 @@ MODULE_PARM_DESC(latency,"pci latency timer");
 MODULE_PARM_DESC(card,"specify TV/grabber card model, see CARDLIST file for a list");
 MODULE_PARM_DESC(pll,"specify installed crystal (0=none, 28=28 MHz, 35=35 MHz)");
 MODULE_PARM_DESC(tuner,"specify installed tuner type");
-MODULE_PARM_DESC(autoload,"automatically load i2c modules like tuner.o, default is 1 (yes)");
+MODULE_PARM_DESC(autoload, "obsolete option, please do not use anymore");
+MODULE_PARM_DESC(audiodev, "specify audio device:\n"
+                "\t\t-1 = no audio\n"
+                "\t\t 0 = autodetect (default)\n"
+                "\t\t 1 = msp3400\n"
+                "\t\t 2 = tda7432\n"
+                "\t\t 3 = tvaudio");
+MODULE_PARM_DESC(saa6588, "if 1, then load the saa6588 RDS module, default (0) is to use the card definition.");
 MODULE_PARM_DESC(no_overlay,"allow override overlay default (0 disables, 1 enables)"
                 " [some VIA/SIS chipsets are known to have problem with overlay]");
 
@@ -3318,6 +3324,17 @@ void __devinit bttv_init_card1(struct bttv *btv)
 /* initialization part two -- after registering i2c bus */
 void __devinit bttv_init_card2(struct bttv *btv)
 {
+        static const unsigned short tvaudio_addrs[] = {
+                I2C_ADDR_TDA8425   >> 1,
+                I2C_ADDR_TEA6300   >> 1,
+                I2C_ADDR_TEA6420   >> 1,
+                I2C_ADDR_TDA9840   >> 1,
+                I2C_ADDR_TDA985x_L >> 1,
+                I2C_ADDR_TDA985x_H >> 1,
+                I2C_ADDR_TDA9874   >> 1,
+                I2C_ADDR_PIC16C54  >> 1,
+                I2C_CLIENT_END
+        };
         int addr=ADDR_UNSET;
 
         btv->tuner_type = UNSET;
@@ -3481,6 +3498,12 @@ void __devinit bttv_init_card2(struct bttv *btv)
                 printk(KERN_INFO "bttv%d: tuner type=%d\n", btv->c.nr,
                        btv->tuner_type);
 
+        if (autoload != UNSET) {
+                printk(KERN_WARNING "bttv%d: the autoload option is obsolete.\n", btv->c.nr);
+                printk(KERN_WARNING "bttv%d: use option msp3400, tda7432 or tvaudio to\n", btv->c.nr);
+                printk(KERN_WARNING "bttv%d: override which audio module should be used.\n", btv->c.nr);
+        }
+
         if (UNSET == btv->tuner_type)
                 btv->tuner_type = TUNER_ABSENT;
 
@@ -3488,8 +3511,13 @@ void __devinit bttv_init_card2(struct bttv *btv)
                 struct tuner_setup tun_setup;
 
                 /* Load tuner module before issuing tuner config call! */
-                if (autoload)
-                        request_module("tuner");
+                if (bttv_tvcards[btv->c.type].has_radio)
+                        v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
+                                "tuner", "tuner", v4l2_i2c_tuner_addrs(ADDRS_RADIO));
+                v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap, "tuner",
+                                "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap, "tuner",
+                                "tuner", v4l2_i2c_tuner_addrs(ADDRS_TV_WITH_DEMOD));
 
                 tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
                 tun_setup.type = btv->tuner_type;
@@ -3498,7 +3526,7 @@ void __devinit bttv_init_card2(struct bttv *btv)
                 if (bttv_tvcards[btv->c.type].has_radio)
                         tun_setup.mode_mask |= T_RADIO;
 
-                bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup);
+                bttv_call_all(btv, tuner, s_type_addr, &tun_setup);
         }
 
         if (btv->tda9887_conf) {
@@ -3507,7 +3535,7 @@ void __devinit bttv_init_card2(struct bttv *btv)
                 tda9887_cfg.tuner = TUNER_TDA9887;
                 tda9887_cfg.priv = &btv->tda9887_conf;
 
-                bttv_call_i2c_clients(btv, TUNER_SET_CONFIG, &tda9887_cfg);
+                bttv_call_all(btv, tuner, s_config, &tda9887_cfg);
         }
 
         btv->dig = bttv_tvcards[btv->c.type].has_dig_in ?
@@ -3530,31 +3558,127 @@ void __devinit bttv_init_card2(struct bttv *btv)
         if (bttv_tvcards[btv->c.type].audio_mode_gpio)
                 btv->audio_mode_gpio=bttv_tvcards[btv->c.type].audio_mode_gpio;
 
-        if (!autoload)
-                return;
-
         if (btv->tuner_type == TUNER_ABSENT)
                 return;  /* no tuner or related drivers to load */
 
+        if (btv->has_saa6588 || saa6588[btv->c.nr]) {
+                /* Probe for RDS receiver chip */
+                static const unsigned short addrs[] = {
+                        0x20 >> 1,
+                        0x22 >> 1,
+                        I2C_CLIENT_END
+                };
+                struct v4l2_subdev *sd;
+
+                sd = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
+                                "saa6588", "saa6588", addrs);
+                btv->has_saa6588 = (sd != NULL);
+        }
+
         /* try to detect audio/fader chips */
-        if (!bttv_tvcards[btv->c.type].no_msp34xx &&
-            bttv_I2CRead(btv, I2C_ADDR_MSP3400, "MSP34xx") >=0)
-                request_module("msp3400");
 
-        if (bttv_tvcards[btv->c.type].msp34xx_alt &&
-            bttv_I2CRead(btv, I2C_ADDR_MSP3400_ALT, "MSP34xx (alternate address)") >=0)
-                request_module("msp3400");
+        /* First check if the user specified the audio chip via a module
+           option. */
+
+        switch (audiodev[btv->c.nr]) {
+        case -1:
+                return; /* do not load any audio module */
+
+        case 0: /* autodetect */
+                break;
+
+        case 1: {
+                /* The user specified that we should probe for msp3400 */
+                static const unsigned short addrs[] = {
+                        I2C_ADDR_MSP3400 >> 1,
+                        I2C_ADDR_MSP3400_ALT >> 1,
+                        I2C_CLIENT_END
+                };
+
+                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
+                                "msp3400", "msp3400", addrs);
+                if (btv->sd_msp34xx)
+                        return;
+                goto no_audio;
+        }
+
+        case 2: {
+                /* The user specified that we should probe for tda7432 */
+                static const unsigned short addrs[] = {
+                        I2C_ADDR_TDA7432 >> 1,
+                        I2C_CLIENT_END
+                };
+
+                if (v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
+                                "tda7432", "tda7432", addrs))
+                        return;
+                goto no_audio;
+        }
 
-        if (!bttv_tvcards[btv->c.type].no_tda9875 &&
-            bttv_I2CRead(btv, I2C_ADDR_TDA9875, "TDA9875") >=0)
-                request_module("tda9875");
+        case 3: {
+                /* The user specified that we should probe for tvaudio */
+                btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
+                                "tvaudio", "tvaudio", tvaudio_addrs);
+                if (btv->sd_tvaudio)
+                        return;
+                goto no_audio;
+        }
 
-        if (!bttv_tvcards[btv->c.type].no_tda7432 &&
-            bttv_I2CRead(btv, I2C_ADDR_TDA7432, "TDA7432") >=0)
-                request_module("tda7432");
+        default:
+                printk(KERN_WARNING "bttv%d: unknown audiodev value!\n",
+                        btv->c.nr);
+                return;
+        }
+
+        /* There were no overrides, so now we try to discover this through the
+           card definition */
+
+        /* probe for msp3400 first: this driver can detect whether or not
+           it really is a msp3400, so it will return NULL when the device
+           found is really something else (e.g. a tea6300). */
+        if (!bttv_tvcards[btv->c.type].no_msp34xx) {
+                static const unsigned short addrs[] = {
+                        I2C_ADDR_MSP3400 >> 1,
+                        I2C_CLIENT_END
+                };
+
+                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
+                                "msp3400", "msp3400", addrs);
+        } else if (bttv_tvcards[btv->c.type].msp34xx_alt) {
+                static const unsigned short addrs[] = {
+                        I2C_ADDR_MSP3400_ALT >> 1,
+                        I2C_CLIENT_END
+                };
+
+                btv->sd_msp34xx = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
+                                "msp3400", "msp3400", addrs);
+        }
+
+        /* If we found a msp34xx, then we're done. */
+        if (btv->sd_msp34xx)
+                return;
+
+        /* it might also be a tda7432. */
+        if (!bttv_tvcards[btv->c.type].no_tda7432) {
+                static const unsigned short addrs[] = {
+                        I2C_ADDR_TDA7432 >> 1,
+                        I2C_CLIENT_END
+                };
+
+                if (v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
+                                "tda7432", "tda7432", addrs))
+                        return;
+        }
+
+        /* Now see if we can find one of the tvaudio devices. */
+        btv->sd_tvaudio = v4l2_i2c_new_probed_subdev(&btv->c.i2c_adap,
+                        "tvaudio", "tvaudio", tvaudio_addrs);
+        if (btv->sd_tvaudio)
+                return;
 
-        if (bttv_tvcards[btv->c.type].needs_tvaudio)
-                request_module("tvaudio");
+no_audio:
+        printk(KERN_WARNING "bttv%d: audio absent, no audio device found!\n",
+                        btv->c.nr);
 }
 
 
@@ -3626,6 +3750,7 @@ static int terratec_active_radio_upgrade(struct bttv *btv)
                 printk("bttv%d: Terratec Active Radio Upgrade found.\n",
                        btv->c.nr);
                 btv->has_radio    = 1;
+                btv->has_saa6588  = 1;
                 btv->has_matchbox = 1;
         } else {
                 btv->has_radio    = 0;
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 1dc79b82cf42..7a8ca0d8356f 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1163,7 +1163,6 @@ audio_mux(struct bttv *btv, int input, int mute)
 {
         int gpio_val, signal;
         struct v4l2_control ctrl;
-        struct i2c_client *c;
 
         gpio_inout(bttv_tvcards[btv->c.type].gpiomask,
                    bttv_tvcards[btv->c.type].gpiomask);
@@ -1197,9 +1196,8 @@ audio_mux(struct bttv *btv, int input, int mute)
 
         ctrl.id = V4L2_CID_AUDIO_MUTE;
         ctrl.value = btv->mute;
-        bttv_call_i2c_clients(btv, VIDIOC_S_CTRL, &ctrl);
-        c = btv->i2c_msp34xx_client;
-        if (c) {
+        bttv_call_all(btv, core, s_ctrl, &ctrl);
+        if (btv->sd_msp34xx) {
                 struct v4l2_routing route;
 
                 /* Note: the inputs tuner/radio/extern/intern are translated
@@ -1238,15 +1236,14 @@ audio_mux(struct bttv *btv, int input, int mute)
                         break;
                 }
                 route.output = MSP_OUTPUT_DEFAULT;
-                c->driver->command(c, VIDIOC_INT_S_AUDIO_ROUTING, &route);
+                v4l2_subdev_call(btv->sd_msp34xx, audio, s_routing, &route);
         }
-        c = btv->i2c_tvaudio_client;
-        if (c) {
+        if (btv->sd_tvaudio) {
                 struct v4l2_routing route;
 
                 route.input = input;
                 route.output = 0;
-                c->driver->command(c, VIDIOC_INT_S_AUDIO_ROUTING, &route);
+                v4l2_subdev_call(btv->sd_tvaudio, audio, s_routing, &route);
         }
         return 0;
 }
@@ -1332,7 +1329,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
                 break;
         }
         id = tvnorm->v4l2_id;
-        bttv_call_i2c_clients(btv, VIDIOC_S_STD, &id);
+        bttv_call_all(btv, tuner, s_std, id);
 
         return 0;
 }
@@ -1476,7 +1473,7 @@ static int bttv_g_ctrl(struct file *file, void *priv,
         case V4L2_CID_AUDIO_BALANCE:
         case V4L2_CID_AUDIO_BASS:
         case V4L2_CID_AUDIO_TREBLE:
-                bttv_call_i2c_clients(btv, VIDIOC_G_CTRL, c);
+                bttv_call_all(btv, core, g_ctrl, c);
                 break;
 
         case V4L2_CID_PRIVATE_CHROMA_AGC:
@@ -1550,12 +1547,12 @@ static int bttv_s_ctrl(struct file *file, void *f,
                 if (btv->volume_gpio)
                         btv->volume_gpio(btv, c->value);
 
-                bttv_call_i2c_clients(btv, VIDIOC_S_CTRL, c);
+                bttv_call_all(btv, core, s_ctrl, c);
                 break;
         case V4L2_CID_AUDIO_BALANCE:
         case V4L2_CID_AUDIO_BASS:
         case V4L2_CID_AUDIO_TREBLE:
-                bttv_call_i2c_clients(btv, VIDIOC_S_CTRL, c);
+                bttv_call_all(btv, core, s_ctrl, c);
                 break;
 
         case V4L2_CID_PRIVATE_CHROMA_AGC:
@@ -1973,7 +1970,7 @@ static int bttv_s_tuner(struct file *file, void *priv,
                 return -EINVAL;
 
         mutex_lock(&btv->lock);
-        bttv_call_i2c_clients(btv, VIDIOC_S_TUNER, t);
+        bttv_call_all(btv, tuner, s_tuner, t);
 
         if (btv->audio_mode_gpio)
                 btv->audio_mode_gpio(btv, t, 1);
@@ -2018,7 +2015,7 @@ static int bttv_s_frequency(struct file *file, void *priv,
                 return -EINVAL;
         mutex_lock(&btv->lock);
         btv->freq = f->frequency;
-        bttv_call_i2c_clients(btv, VIDIOC_S_FREQUENCY, f);
+        bttv_call_all(btv, tuner, s_frequency, f);
         if (btv->has_matchbox && btv->radio_user)
                 tea5757_set_freq(btv, btv->freq);
         mutex_unlock(&btv->lock);
@@ -2032,7 +2029,7 @@ static int bttv_log_status(struct file *file, void *f)
 
         printk(KERN_INFO "bttv%d: ========  START STATUS CARD #%d  ========\n",
                         btv->c.nr, btv->c.nr);
-        bttv_call_i2c_clients(btv, VIDIOC_LOG_STATUS, NULL);
+        bttv_call_all(btv, core, log_status);
         printk(KERN_INFO "bttv%d: ========  END STATUS CARD   #%d  ========\n",
                         btv->c.nr, btv->c.nr);
         return 0;
@@ -2946,7 +2943,7 @@ static int bttv_g_tuner(struct file *file, void *priv,
 
         mutex_lock(&btv->lock);
         t->rxsubchans = V4L2_TUNER_SUB_MONO;
-        bttv_call_i2c_clients(btv, VIDIOC_G_TUNER, t);
+        bttv_call_all(btv, tuner, g_tuner, t);
         strcpy(t->name, "Television");
         t->capability = V4L2_TUNER_CAP_NORM;
         t->type       = V4L2_TUNER_ANALOG_TV;
@@ -3437,7 +3434,7 @@ static int radio_open(struct file *file)
 
         btv->radio_user++;
 
-        bttv_call_i2c_clients(btv,AUDC_SET_RADIO,NULL);
+        bttv_call_all(btv, tuner, s_radio);
         audio_input(btv,TVAUDIO_INPUT_RADIO);
 
         mutex_unlock(&btv->lock);
@@ -3457,7 +3454,7 @@ static int radio_release(struct file *file)
 
         btv->radio_user--;
 
-        bttv_call_i2c_clients(btv, RDS_CMD_CLOSE, &cmd);
+        bttv_call_all(btv, core, ioctl, RDS_CMD_CLOSE, &cmd);
 
         return 0;
 }
@@ -3490,7 +3487,7 @@ static int radio_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
         strcpy(t->name, "Radio");
         t->type = V4L2_TUNER_RADIO;
 
-        bttv_call_i2c_clients(btv, VIDIOC_G_TUNER, t);
+        bttv_call_all(btv, tuner, g_tuner, t);
 
         if (btv->audio_mode_gpio)
                 btv->audio_mode_gpio(btv, t, 0);
@@ -3532,7 +3529,7 @@ static int radio_s_tuner(struct file *file, void *priv,
         if (0 != t->index)
                 return -EINVAL;
 
-        bttv_call_i2c_clients(btv, VIDIOC_G_TUNER, t);
+        bttv_call_all(btv, tuner, g_tuner, t);
         return 0;
 }
 
@@ -3593,7 +3590,7 @@ static ssize_t radio_read(struct file *file, char __user *data,
         cmd.instance = file;
         cmd.result = -ENODEV;
 
-        bttv_call_i2c_clients(btv, RDS_CMD_READ, &cmd);
+        bttv_call_all(btv, core, ioctl, RDS_CMD_READ, &cmd);
 
         return cmd.result;
 }
@@ -3606,7 +3603,7 @@ static unsigned int radio_poll(struct file *file, poll_table *wait)
         cmd.instance = file;
         cmd.event_list = wait;
         cmd.result = -ENODEV;
-        bttv_call_i2c_clients(btv, RDS_CMD_POLL, &cmd);
+        bttv_call_all(btv, core, ioctl, RDS_CMD_POLL, &cmd);
 
         return cmd.result;
 }
diff --git a/drivers/media/video/bt8xx/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c
index 9b66c5b09321..a99d92fac3dc 100644
--- a/drivers/media/video/bt8xx/bttv-i2c.c
+++ b/drivers/media/video/bt8xx/bttv-i2c.c
@@ -36,8 +36,6 @@
 #include <linux/jiffies.h>
 #include <asm/io.h>
 
-static int attach_inform(struct i2c_client *client);
-
 static int i2c_debug;
 static int i2c_hw;
 static int i2c_scan;
@@ -266,51 +264,6 @@ static const struct i2c_algorithm bttv_algo = {
 /* ----------------------------------------------------------------------- */
 /* I2C functions - common stuff                                            */
 
-static int attach_inform(struct i2c_client *client)
-{
-        struct v4l2_device *v4l2_dev = i2c_get_adapdata(client->adapter);
-        struct bttv *btv = to_bttv(v4l2_dev);
-        int addr=ADDR_UNSET;
-
-
-        if (ADDR_UNSET != bttv_tvcards[btv->c.type].tuner_addr)
-                addr = bttv_tvcards[btv->c.type].tuner_addr;
-
-
-        if (bttv_debug)
-                printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
-                        btv->c.nr, client->driver->driver.name, client->addr,
-                        client->name);
-        if (!client->driver->command)
-                return 0;
-
-        if (client->driver->id == I2C_DRIVERID_MSP3400)
-                btv->i2c_msp34xx_client = client;
-        if (client->driver->id == I2C_DRIVERID_TVAUDIO)
-                btv->i2c_tvaudio_client = client;
-        if (btv->tuner_type != TUNER_ABSENT) {
-                struct tuner_setup tun_setup;
-
-                if (addr == ADDR_UNSET || addr == client->addr) {
-                        tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV | T_RADIO;
-                        tun_setup.type = btv->tuner_type;
-                        tun_setup.addr = addr;
-                        bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup);
-                }
-
-        }
-
-        return 0;
-}
-
-void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg)
-{
-        if (0 != btv->i2c_rc)
-                return;
-        i2c_clients_command(&btv->c.i2c_adap, cmd, arg);
-}
-
-
 /* read I2C */
 int bttv_I2CRead(struct bttv *btv, unsigned char addr, char *probe_for)
 {
@@ -417,8 +370,6 @@ int __devinit init_bttv_i2c(struct bttv *btv)
                 btv->c.i2c_adap.algo_data = &btv->i2c_algo;
         }
         btv->c.i2c_adap.owner = THIS_MODULE;
-        btv->c.i2c_adap.class = I2C_CLASS_TV_ANALOG;
-        btv->c.i2c_adap.client_register = attach_inform;
 
         btv->c.i2c_adap.dev.parent = &btv->c.pci->dev;
         snprintf(btv->c.i2c_adap.name, sizeof(btv->c.i2c_adap.name),
@@ -428,10 +379,6 @@ int __devinit init_bttv_i2c(struct bttv *btv)
         i2c_set_adapdata(&btv->c.i2c_adap, &btv->c.v4l2_dev);
         btv->i2c_client.adapter = &btv->c.i2c_adap;
 
-        if (bttv_tvcards[btv->c.type].no_video)
-                btv->c.i2c_adap.class &= ~I2C_CLASS_TV_ANALOG;
-        if (bttv_tvcards[btv->c.type].has_dvb)
-                btv->c.i2c_adap.class |= I2C_CLASS_TV_DIGITAL;
 
         if (btv->use_i2c_hw) {
                 btv->i2c_rc = i2c_add_adapter(&btv->c.i2c_adap);
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index fac5f86356d2..3d36daf206f3 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -240,6 +240,9 @@ struct tvcard {
         unsigned int no_tda7432:1;
         unsigned int needs_tvaudio:1;
         unsigned int msp34xx_alt:1;
+        /* Note: currently no card definition needs to mark the presence
+           of a RDS saa6588 chip. If this is ever needed, then add a new
+           'has_saa6588' bit here. */
 
         unsigned int no_video:1; /* video pci function is unused */
         unsigned int has_dvb:1;
@@ -355,7 +358,9 @@ void bttv_gpio_bits(struct bttv_core *core, u32 mask, u32 bits);
 /* ---------------------------------------------------------- */
 /* i2c                                                        */
 
-extern void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg);
+#define bttv_call_all(btv, o, f, args...) \
+        v4l2_device_call_all(&btv->c.v4l2_dev, 0, o, f, ##args)
+
 extern int bttv_I2CRead(struct bttv *btv, unsigned char addr, char *probe_for);
 extern int bttv_I2CWrite(struct bttv *btv, unsigned char addr, unsigned char b1,
                          unsigned char b2, int both);
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 5755b407c0a2..96498489199d 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -329,6 +329,7 @@ struct bttv {
         unsigned int tuner_type;  /* tuner chip type */
         unsigned int tda9887_conf;
         unsigned int svhs, dig;
+        unsigned int has_saa6588:1;
         struct bttv_pll_info pll;
         int triton1;
         int gpioirq;
@@ -352,8 +353,8 @@ struct bttv {
         int                        i2c_state, i2c_rc;
         int                        i2c_done;
         wait_queue_head_t          i2c_queue;
-        struct i2c_client         *i2c_msp34xx_client;
-        struct i2c_client         *i2c_tvaudio_client;
+        struct v4l2_subdev        *sd_msp34xx;
+        struct v4l2_subdev        *sd_tvaudio;
 
         /* video4linux (1) */
         struct video_device *video_dev;