V4L/DVB (4495): Fix "no data from ZL10353 based USB tuner" problem

Force parallel transport stream output on the ZL10353 attached to a
bluebird device.
Addresses the problem where a frontend lock was observed, but no MPEG
transport data was received.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 7 insertions, 1 deletions

diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index 953fb55d87b6..84abbaf362fb 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -243,9 +243,12 @@ static int zl10353_init(struct dvb_frontend *fe)
 
         if (debug_regs)
                 zl10353_dump_regs(fe);
+        if (state->config.parallel_ts)
+                zl10353_reset_attach[2] &= ~0x20;
 
         /* Do a "hard" reset if not already done */
-        if (zl10353_read_register(state, 0x50) != 0x03) {
+        if (zl10353_read_register(state, 0x50) != zl10353_reset_attach[1] ||
+            zl10353_read_register(state, 0x51) != zl10353_reset_attach[2]) {
                 rc = zl10353_write(fe, zl10353_reset_attach,
                                    sizeof(zl10353_reset_attach));
                 if (debug_regs)
diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
index 6aec655d8814..79a947215c4d 100644
--- a/drivers/media/dvb/frontends/zl10353.h
+++ b/drivers/media/dvb/frontends/zl10353.h
@@ -31,6 +31,9 @@ struct zl10353_config
 
         /* set if no pll is connected to the secondary i2c bus */
         int no_tuner;
+
+        /* set if parallel ts output is required */
+        int parallel_ts;
 };
 
 #if defined(CONFIG_DVB_ZL10353) || defined(CONFIG_DVB_ZL10353_MODULE)