V4L/DVB (8940): saa7115: fix saa7111(a) support

The saa7111 support in saa7115.c was missing some features and did not
properly take some of the differences into account. With this patch
saa7115 can be used in the mxb driver instead of saa7111.c.

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

1 files changed, 29 insertions, 5 deletions

diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index ad733caec72..4ed7d65dd63 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1309,10 +1309,13 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
         case VIDIOC_INT_S_VIDEO_ROUTING:
         {
                 struct v4l2_routing *route = arg;
+                u32 input = route->input;
+                u8 mask = (state->ident == V4L2_IDENT_SAA7111) ? 0xf8 : 0xf0;
 
                 v4l_dbg(1, debug, client, "decoder set input %d output %d\n", route->input, route->output);
-                /* saa7113 does not have these inputs */
-                if (state->ident == V4L2_IDENT_SAA7113 &&
+                /* saa7111/3 does not have these inputs */
+                if ((state->ident == V4L2_IDENT_SAA7113 ||
+                     state->ident == V4L2_IDENT_SAA7111) &&
                     (route->input == SAA7115_COMPOSITE4 ||
                      route->input == SAA7115_COMPOSITE5)) {
                         return -EINVAL;
@@ -1327,10 +1330,23 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
                         (route->input >= SAA7115_SVIDEO0) ? "S-Video" : "Composite", (route->output == SAA7115_IPORT_ON) ? "iport on" : "iport off");
                 state->input = route->input;
 
+                /* saa7111 has slightly different input numbering */
+                if (state->ident == V4L2_IDENT_SAA7111) {
+                        if (input >= SAA7115_COMPOSITE4)
+                                input -= 2;
+                        /* saa7111 specific */
+                        saa711x_write(client, R_10_CHROMA_CNTL_2,
+                                        (saa711x_read(client, R_10_CHROMA_CNTL_2) & 0x3f) |
+                                        ((route->output & 0xc0) ^ 0x40));
+                        saa711x_write(client, R_13_RT_X_PORT_OUT_CNTL,
+                                        (saa711x_read(client, R_13_RT_X_PORT_OUT_CNTL) & 0xf0) |
+                                        ((route->output & 2) ? 0x0a : 0));
+                }
+
                 /* select mode */
                 saa711x_write(client, R_02_INPUT_CNTL_1,
-                              (saa711x_read(client, R_02_INPUT_CNTL_1) & 0xf0) |
-                               state->input);
+                              (saa711x_read(client, R_02_INPUT_CNTL_1) & mask) |
+                               input);
 
                 /* bypass chrominance trap for S-Video modes */
                 saa711x_write(client, R_09_LUMA_CNTL,
@@ -1384,6 +1400,13 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
                 saa711x_writeregs(client, saa7115_cfg_reset_scaler);
                 break;
 
+        case VIDIOC_INT_S_GPIO:
+                if (state->ident != V4L2_IDENT_SAA7111)
+                        return -EINVAL;
+                saa711x_write(client, 0x11, (saa711x_read(client, 0x11) & 0x7f) |
+                        (*(u32 *)arg ? 0x80 : 0));
+                break;
+
         case VIDIOC_INT_G_VBI_DATA:
         {
                 struct v4l2_sliced_vbi_data *data = arg;
@@ -1539,7 +1562,8 @@ static int saa7115_probe(struct i2c_client *client,
                 state->crystal_freq = SAA7115_FREQ_32_11_MHZ;
                 saa711x_writeregs(client, saa7115_init_auto_input);
         }
-        saa711x_writeregs(client, saa7115_init_misc);
+        if (state->ident != V4L2_IDENT_SAA7111)
+                saa711x_writeregs(client, saa7115_init_misc);
         saa711x_set_v4lstd(client, V4L2_STD_NTSC);
 
         v4l_dbg(1, debug, client, "status: (1E) 0x%02x, (1F) 0x%02x\n",