[PATCH 28/37] dvb: stv0299: reduce i2c xfer and set register 0x12 from inittab

[PATCH 28/37] dvb: stv0299: reduce i2c xfer and set register 0x12 from inittab

[Michael Krufky]

[-- Attachment #1: Type: text/plain, Size: 2 bytes --]




[-- Attachment #2: 2405.patch --]
[-- Type: text/x-patch, Size: 3427 bytes --]

From: Oliver Endriss <o.endriss@gmx.de>

stv0299_set_frontend(): reduced number of i2c transfers, set register 0x12 from inittab

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>

 drivers/media/dvb/frontends/stv0299.c  |    2 --
 drivers/media/dvb/ttpci/av7110.c       |    4 ++--
 drivers/media/dvb/ttpci/budget-av.c    |    2 +-
 drivers/media/dvb/ttpci/budget-ci.c    |    2 +-
 drivers/media/dvb/ttpci/budget-patch.c |    2 +-
 drivers/media/dvb/ttpci/budget.c       |    4 ++--
 6 files changed, 7 insertions(+), 9 deletions(-)

--- linux-2.6.14-git3.orig/drivers/media/dvb/frontends/stv0299.c
+++ linux-2.6.14-git3/drivers/media/dvb/frontends/stv0299.c
@@ -561,8 +561,6 @@
 	stv0299_set_symbolrate (fe, p->u.qpsk.symbol_rate);
 	stv0299_writeregI(state, 0x22, 0x00);
 	stv0299_writeregI(state, 0x23, 0x00);
-	stv0299_readreg (state, 0x23);
-	stv0299_writeregI(state, 0x12, 0xb9);
 
 	state->tuner_frequency = p->frequency;
 	state->fec_inner = p->u.qpsk.fec_inner;
--- linux-2.6.14-git3.orig/drivers/media/dvb/ttpci/av7110.c
+++ linux-2.6.14-git3/drivers/media/dvb/ttpci/av7110.c
@@ -1566,7 +1566,7 @@
 	0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
 	0x10, 0x3f,   // AGC2  0x3d
 	0x11, 0x84,
-	0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+	0x12, 0xb9,
 	0x15, 0xc9,   // lock detector threshold
 	0x16, 0x00,
 	0x17, 0x00,
@@ -1668,7 +1668,7 @@
 	0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
 	0x10, 0x3f,   // AGC2  0x3d
 	0x11, 0x84,
-	0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+	0x12, 0xb9,
 	0x15, 0xc9,   // lock detector threshold
 	0x16, 0x00,
 	0x17, 0x00,
--- linux-2.6.14-git3.orig/drivers/media/dvb/ttpci/budget-av.c
+++ linux-2.6.14-git3/drivers/media/dvb/ttpci/budget-av.c
@@ -499,7 +499,7 @@
 	0x0e, 0x23,		/* alpha_tmg = 2, beta_tmg = 3 */
 	0x10, 0x3f,		// AGC2  0x3d
 	0x11, 0x84,
-	0x12, 0xb5,		// Lock detect: -64  Carrier freq detect:on
+	0x12, 0xb9,
 	0x15, 0xc9,		// lock detector threshold
 	0x16, 0x00,
 	0x17, 0x00,
--- linux-2.6.14-git3.orig/drivers/media/dvb/ttpci/budget-ci.c
+++ linux-2.6.14-git3/drivers/media/dvb/ttpci/budget-ci.c
@@ -490,7 +490,7 @@
 	0x0e, 0x23,		/* alpha_tmg = 2, beta_tmg = 3 */
 	0x10, 0x3f,		// AGC2  0x3d
 	0x11, 0x84,
-	0x12, 0xb5,		// Lock detect: -64  Carrier freq detect:on
+	0x12, 0xb9,
 	0x15, 0xc9,		// lock detector threshold
 	0x16, 0x00,
 	0x17, 0x00,
--- linux-2.6.14-git3.orig/drivers/media/dvb/ttpci/budget-patch.c
+++ linux-2.6.14-git3/drivers/media/dvb/ttpci/budget-patch.c
@@ -305,7 +305,7 @@
 	0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
 	0x10, 0x3f,   // AGC2  0x3d
 	0x11, 0x84,
-	0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+	0x12, 0xb9,
 	0x15, 0xc9,   // lock detector threshold
 	0x16, 0x00,
 	0x17, 0x00,
--- linux-2.6.14-git3.orig/drivers/media/dvb/ttpci/budget.c
+++ linux-2.6.14-git3/drivers/media/dvb/ttpci/budget.c
@@ -286,7 +286,7 @@
 	0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
 	0x10, 0x3f,   // AGC2  0x3d
 	0x11, 0x84,
-	0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+	0x12, 0xb9,
 	0x15, 0xc9,   // lock detector threshold
 	0x16, 0x00,
 	0x17, 0x00,
@@ -383,7 +383,7 @@
 	0x0e, 0x23,  /* alpha_tmg = 2, beta_tmg = 3 */
 	0x10, 0x3f,  // AGC2 0x3d
 	0x11, 0x84,
-	0x12, 0xb5,  // Lock detect: -64 Carrier freq detect:on
+	0x12, 0xb9,
 	0x15, 0xc9,  // lock detector threshold
 	0x16, 0x00,
 	0x17, 0x00,