V4L/DVB (3712): Fix video input setting of em28xx, use _INT_S_VIDEO_ROUTING in tvp5150

- Use new routing input defines in em28xx-cards.c
- Fix S-Video settings for tvp5150-based cards (input was copied from saa7115
  based cards and worked only because S-Video was selected in the default: case)
- Replace VIDIOC_S_INPUT by VIDIOC_INT_S_VIDEO_ROUTING in em28xx-video.c
- Remove the now obsolete VIDIOC_S_INPUT handler in saa7115.c
- Add VIDIOC_INT_G/S_VIDEO_ROUTING in tvp5150.c
- Add new media/tvp5150.h with the routing defines.

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

2 files changed, 41 insertions, 35 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 3ba3439db580..eb8132bff313 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -29,6 +29,8 @@
 #include <linux/usb.h>
 #include <media/tuner.h>
 #include <media/msp3400.h>
+#include <media/saa7115.h>
+#include <media/tvp5150.h>
 #include <media/tveeprom.h>
 #include <media/audiochip.h>
 #include <media/v4l2-common.h>
@@ -46,11 +48,11 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA7113,
                 .input           = {{
                         .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = 0,
+                        .vmux     = SAA7115_COMPOSITE0,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 9,
+                        .vmux     = SAA7115_SVIDEO3,
                         .amux     = 1,
                 }},
         },
@@ -64,11 +66,11 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA7113,
                 .input           = {{
                         .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = 0,
+                        .vmux     = SAA7115_COMPOSITE0,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 9,
+                        .vmux     = SAA7115_SVIDEO3,
                         .amux     = 1,
                 }},
         },
@@ -82,11 +84,11 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA7113,
                 .input           = {{
                         .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = 0,
+                        .vmux     = SAA7115_COMPOSITE0,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 9,
+                        .vmux     = SAA7115_SVIDEO3,
                         .amux     = 1,
                 }},
         },
@@ -100,15 +102,15 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA7113,
                 .input          = {{
                         .type     = EM28XX_VMUX_TELEVISION,
-                        .vmux     = 2,
+                        .vmux     = SAA7115_COMPOSITE2,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = 0,
+                        .vmux     = SAA7115_COMPOSITE0,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 9,
+                        .vmux     = SAA7115_SVIDEO3,
                         .amux     = 1,
                 }},
         },
@@ -122,15 +124,15 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA7113,
                 .input          = {{
                         .type     = EM28XX_VMUX_TELEVISION,
-                        .vmux     = 2,
+                        .vmux     = SAA7115_COMPOSITE2,
                         .amux     = 0,
                 },{
                         .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = 0,
+                        .vmux     = SAA7115_COMPOSITE0,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 9,
+                        .vmux     = SAA7115_SVIDEO3,
                         .amux     = 1,
                 }},
         },
@@ -146,11 +148,11 @@ struct em28xx_board em28xx_boards[] = {
                 /*FIXME: S-Video not tested */
                 .input          = {{
                         .type     = EM28XX_VMUX_TELEVISION,
-                        .vmux     = 0,
+                        .vmux     = TVP5150_COMPOSITE0,
                         .amux     = MSP_INPUT_DEFAULT,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 2,
+                        .vmux     = TVP5150_SVIDEO,
                         .amux     = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
                                         MSP_DSP_IN_SCART, MSP_DSP_IN_SCART),
                 }},
@@ -165,15 +167,15 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder        = EM28XX_SAA7114,
                 .input          = {{
                         .type     = EM28XX_VMUX_TELEVISION,
-                        .vmux     = 4,
+                        .vmux     = SAA7115_COMPOSITE4,
                         .amux     = 0,
                 },{
                         .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = 0,
+                        .vmux     = SAA7115_COMPOSITE0,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 9,
+                        .vmux     = SAA7115_SVIDEO3,
                         .amux     = 1,
                 }},
         },
@@ -188,15 +190,15 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA7113,
                 .input          = {{
                         .type     = EM28XX_VMUX_TELEVISION,
-                        .vmux     = 2,
+                        .vmux     = SAA7115_COMPOSITE2,
                         .amux     = 0,
                 },{
                         .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = 0,
+                        .vmux     = SAA7115_COMPOSITE0,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 9,
+                        .vmux     = SAA7115_SVIDEO3,
                         .amux     = 1,
                 }},
         },
@@ -211,15 +213,15 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA7113,
                 .input          = {{
                         .type     = EM28XX_VMUX_TELEVISION,
-                        .vmux     = 2,
+                        .vmux     = SAA7115_COMPOSITE2,
                         .amux     = 0,
                 },{
                         .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = 0,
+                        .vmux     = SAA7115_COMPOSITE0,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 9,
+                        .vmux     = SAA7115_SVIDEO3,
                         .amux     = 1,
                 }},
         },
@@ -234,15 +236,15 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA7113,
                 .input          = {{
                         .type     = EM28XX_VMUX_TELEVISION,
-                        .vmux     = 2,
+                        .vmux     = SAA7115_COMPOSITE2,
                         .amux     = 0,
                 },{
                         .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = 0,
+                        .vmux     = SAA7115_COMPOSITE0,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 9,
+                        .vmux     = SAA7115_SVIDEO3,
                         .amux     = 1,
                 }},
         },
@@ -254,11 +256,11 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_SAA7113,
                 .input          = {{
                         .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = 0,
+                        .vmux     = SAA7115_COMPOSITE0,
                         .amux     = 1,
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = 9,
+                        .vmux     = SAA7115_SVIDEO3,
                         .amux     = 1,
                 }},
         },
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index cf7cdf9ef617..1a0062b649a8 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -170,8 +170,12 @@ static int em28xx_config(struct em28xx *dev)
 static void em28xx_config_i2c(struct em28xx *dev)
 {
         struct v4l2_frequency f;
+        struct v4l2_routing route;
+
+        route.input = INPUT(dev->ctl_input)->vmux;
+        route.output = 0;
         em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL);
-        em28xx_i2c_call_clients(dev, VIDIOC_S_INPUT, &dev->ctl_input);
+        em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
         em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);
 
         /* configure tuner */
@@ -206,19 +210,19 @@ static void em28xx_empty_framequeues(struct em28xx *dev)
 
 static void video_mux(struct em28xx *dev, int index)
 {
-        int input, ainput;
+        int ainput;
+        struct v4l2_routing route;
 
-        input = INPUT(index)->vmux;
+        route.input = INPUT(index)->vmux;
+        route.output = 0;
         dev->ctl_input = index;
         dev->ctl_ainput = INPUT(index)->amux;
 
-        em28xx_i2c_call_clients(dev, VIDIOC_S_INPUT, &input);
+        em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
 
-        em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,input,dev->ctl_ainput);
+        em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,route.input,dev->ctl_ainput);
 
         if (dev->has_msp34xx) {
-                struct v4l2_routing route;
-
                 if (dev->i2s_speed)
                         em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ, &dev->i2s_speed);
                 route.input = dev->ctl_ainput;