V4L/DVB (3582): Implement correct msp3400 input/output routing

- implement VIDIOC_INT_S_AUDIO_ROUTING for msp3400 and tvaudio
- use the new command in bttv, pvrusb2 and em28xx.
- remove the now obsolete MSP_SET_MATRIX from msp3400 (yeah!)
- remove the obsolete VIDIOC_S_AUDIO from msp3400.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 24 insertions, 0 deletions

diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 15fd55ff69ca..4e6d030d83c0 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1682,6 +1682,30 @@ static int chip_command(struct i2c_client *client,
         case VIDIOC_S_CTRL:
                 return tvaudio_set_ctrl(chip, arg);
 
+        case VIDIOC_INT_G_AUDIO_ROUTING:
+        {
+                struct v4l2_routing *rt = arg;
+
+                rt->input = chip->input;
+                rt->output = 0;
+                break;
+        }
+
+        case VIDIOC_INT_S_AUDIO_ROUTING:
+        {
+                struct v4l2_routing *rt = arg;
+
+                if (!(desc->flags & CHIP_HAS_INPUTSEL) || rt->input >= 4)
+                                return -EINVAL;
+                /* There are four inputs: tuner, radio, extern and intern. */
+                chip->input = rt->input;
+                if (chip->muted)
+                        break;
+                chip_write_masked(chip, desc->inputreg,
+                                desc->inputmap[chip->input], desc->inputmask);
+                break;
+        }
+
         case VIDIOC_S_AUDIO:
         {
                 struct v4l2_audio *sarg = arg;