V4L/DVB (8019): New for I2S on for MPEG of saa7134_empress

Rework saa7134_enable_i2s function. Remove vendor specific data.
Configure I2S output port specific for model of SAA7133/5-SAA7134.
I think it is more good.
Renamed definition of I2S audio output control register. It`s SAA7133/5 register
Start video port after configuring procedure.

Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index bba23219ce9..8a8b3e118f8 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -2458,13 +2458,14 @@ int saa7134_videoport_init(struct saa7134_dev *dev)
         int vo = saa7134_boards[dev->board].video_out;
         int video_reg;
         unsigned int vid_port_opts = saa7134_boards[dev->board].vid_port_opts;
+
+        /* Configure videoport */
         saa_writeb(SAA7134_VIDEO_PORT_CTRL0, video_out[vo][0]);
         video_reg = video_out[vo][1];
         if (vid_port_opts & SET_T_CODE_POLARITY_NON_INVERTED)
                 video_reg &= ~VP_T_CODE_P_INVERTED;
         saa_writeb(SAA7134_VIDEO_PORT_CTRL1, video_reg);
         saa_writeb(SAA7134_VIDEO_PORT_CTRL2, video_out[vo][2]);
-        saa_writeb(SAA7134_VIDEO_PORT_CTRL3, video_out[vo][3]);
         saa_writeb(SAA7134_VIDEO_PORT_CTRL4, video_out[vo][4]);
         video_reg = video_out[vo][5];
         if (vid_port_opts & SET_CLOCK_NOT_DELAYED)
@@ -2481,6 +2482,9 @@ int saa7134_videoport_init(struct saa7134_dev *dev)
         saa_writeb(SAA7134_VIDEO_PORT_CTRL7, video_out[vo][7]);
         saa_writeb(SAA7134_VIDEO_PORT_CTRL8, video_out[vo][8]);
 
+        /* Start videoport */
+        saa_writeb(SAA7134_VIDEO_PORT_CTRL3, video_out[vo][3]);
+
         return 0;
 }