1 files changed, 32 insertions, 2 deletions

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index b1fedb0f6431..cb555f2c40f9 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1218,7 +1218,14 @@ audio_mux(struct bttv *btv, int input, int mute)
                         break;
                 case TVAUDIO_INPUT_TUNER:
                 default:
-                        route.input = MSP_INPUT_DEFAULT;
+                        /* This is the only card that uses TUNER2, and afaik,
+                           is the only difference between the VOODOOTV_FM
+                           and VOODOOTV_200 */
+                        if (btv->c.type == BTTV_BOARD_VOODOOTV_200)
+                                route.input = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER2, \
+                                        MSP_DSP_IN_TUNER, MSP_DSP_IN_TUNER);
+                        else
+                                route.input = MSP_INPUT_DEFAULT;
                         break;
                 }
                 route.output = MSP_OUTPUT_DEFAULT;
@@ -1253,7 +1260,7 @@ i2c_vidiocschan(struct bttv *btv)
         v4l2_std_id std = bttv_tvnorms[btv->tvnorm].v4l2_id;
 
         bttv_call_i2c_clients(btv, VIDIOC_S_STD, &std);
-        if (btv->c.type == BTTV_BOARD_VOODOOTV_FM)
+        if (btv->c.type == BTTV_BOARD_VOODOOTV_FM || btv->c.type == BTTV_BOARD_VOODOOTV_200)
                 bttv_tda9880_setnorm(btv,btv->tvnorm);
 }
 
@@ -1323,6 +1330,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
 
         switch (btv->c.type) {
         case BTTV_BOARD_VOODOOTV_FM:
+        case BTTV_BOARD_VOODOOTV_200:
                 bttv_tda9880_setnorm(btv,norm);
                 break;
         }
@@ -2251,6 +2259,24 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                 printk(KERN_INFO "bttv%d: ==================  END STATUS CARD #%d  ==================\n", btv->c.nr, btv->c.nr);
                 return 0;
         }
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
+        {
+                struct v4l2_register *reg = arg;
+                if (!capable(CAP_SYS_ADMIN))
+                        return -EPERM;
+                if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
+                        return -EINVAL;
+                /* bt848 has a 12-bit register space */
+                reg->reg &= 0xfff;
+                if (cmd == VIDIOC_DBG_G_REGISTER)
+                        reg->val = btread(reg->reg);
+                else
+                        btwrite(reg->val, reg->reg);
+                return 0;
+        }
+#endif
 
         default:
                 return -ENOIOCTLCMD;
@@ -3561,6 +3587,8 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_G_FREQUENCY:
         case VIDIOC_S_FREQUENCY:
         case VIDIOC_LOG_STATUS:
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
                 return bttv_common_ioctls(btv,cmd,arg);
 
         default:
@@ -3943,6 +3971,8 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOCGAUDIO:
         case VIDIOCSAUDIO:
         case VIDIOC_LOG_STATUS:
+        case VIDIOC_DBG_G_REGISTER:
+        case VIDIOC_DBG_S_REGISTER:
                 return bttv_common_ioctls(btv,cmd,arg);
 
         default: