From f8a24bbd7d624cd35e82e3a8fec5e9769b2bda9f Mon Sep 17 00:00:00 2001
From: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Date: Thu, 10 Aug 2006 03:17:16 -0300
Subject: [PATCH] --- yaml --- r: 37406 b: refs/heads/master c:
 8fb957841b2f4311e6418dcbef24564e4cebb87d h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/dvb/dvb-usb/cxusb.c     | 1 +
 trunk/drivers/media/dvb/frontends/zl10353.c | 5 ++++-
 trunk/drivers/media/dvb/frontends/zl10353.h | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e004d4f984c0..be9133558c94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5b168d7b9e28e0569ed4fe2c0a44fae71df30b5
+refs/heads/master: 8fb957841b2f4311e6418dcbef24564e4cebb87d
diff --git a/trunk/drivers/media/dvb/dvb-usb/cxusb.c b/trunk/drivers/media/dvb/dvb-usb/cxusb.c
index ac72e7ed9fcc..c710c0176e07 100644
--- a/trunk/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/trunk/drivers/media/dvb/dvb-usb/cxusb.c
@@ -349,6 +349,7 @@ static struct mt352_config cxusb_dee1601_config = {
 
 static struct zl10353_config cxusb_zl10353_dee1601_config = {
 	.demod_address = 0x0f,
+	.parallel_ts = 1,
 };
 
 static struct mt352_config cxusb_mt352_config = {
diff --git a/trunk/drivers/media/dvb/frontends/zl10353.c b/trunk/drivers/media/dvb/frontends/zl10353.c
index 953fb55d87b6..84abbaf362fb 100644
--- a/trunk/drivers/media/dvb/frontends/zl10353.c
+++ b/trunk/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/trunk/drivers/media/dvb/frontends/zl10353.h b/trunk/drivers/media/dvb/frontends/zl10353.h
index 6aec655d8814..79a947215c4d 100644
--- a/trunk/drivers/media/dvb/frontends/zl10353.h
+++ b/trunk/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)