V4L/DVB (10924): saa7134: enable serial transport streaming interface

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index ef55a59f0cda59623cec062bea0a313051d8857a..cc8b923afbc077c37cee7708a4518c2b91968f09 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/drivers/media/video/saa7134/saa7134-ts.c
@@ -79,8 +79,19 @@ static int buffer_activate(struct saa7134_dev *dev,
                saa_writeb(SAA7134_TS_SERIAL1, 0x00);
 
                /* Start TS stream */
-               saa_writeb(SAA7134_TS_SERIAL0, 0x40);
-               saa_writeb(SAA7134_TS_PARALLEL, 0xEC);
+               switch (saa7134_boards[dev->board].ts_type) {
+               case SAA7134_MPEG_TS_PARALLEL:
+                       saa_writeb(SAA7134_TS_SERIAL0, 0x40);
+                       saa_writeb(SAA7134_TS_PARALLEL, 0xec);
+                       break;
+               case SAA7134_MPEG_TS_SERIAL:
+                       saa_writeb(SAA7134_TS_SERIAL0, 0xd8);
+                       saa_writeb(SAA7134_TS_PARALLEL, 0x6c);
+                       saa_writeb(SAA7134_TS_PARALLEL_SERIAL, 0xbc);
+                       saa_writeb(SAA7134_TS_SERIAL1, 0x02);
+                       break;
+               }
+
                dev->ts_state = SAA7134_TS_STARTED;
        }
 

diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index f078de98ef578c20ff5228d9e42b54b12f0c7720..d1498e55bef307caa07af88e4796890bdbc4f5a6 100644 (file)
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -312,6 +312,11 @@ enum saa7134_mpeg_type {
        SAA7134_MPEG_DVB,
 };
 
+enum saa7134_mpeg_ts_type {
+       SAA7134_MPEG_TS_PARALLEL = 0,
+       SAA7134_MPEG_TS_SERIAL,
+};
+
 struct saa7134_board {
        char                    *name;
        unsigned int            audio_clock;
@@ -334,6 +339,7 @@ struct saa7134_board {
        /* peripheral I/O */
        enum saa7134_video_out  video_out;
        enum saa7134_mpeg_type  mpeg;
+       enum saa7134_mpeg_ts_type ts_type;
        unsigned int            vid_port_opts;
 };