summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Benesch <twoof7@freenet.de>2009-10-11 14:53:23 +0200
committerMatthias Benesch <twoof7@freenet.de>2009-10-11 14:53:23 +0200
commitf54aa101e722c6ffade627cb5cf43b50d894cd9c (patch)
tree2f480ff35b5fab7eaf316ca368904d0460a36a28
parentf3c1d3f451080e0e216b8a9cd409dbd27c3009e7 (diff)
downloadmediapointer-dvb-s2-f54aa101e722c6ffade627cb5cf43b50d894cd9c.tar.gz
mediapointer-dvb-s2-f54aa101e722c6ffade627cb5cf43b50d894cd9c.tar.bz2
Changed stv0900_config.
Removed stv0900_regs and set stv0900_config.ts_config_regs=NULL. Set path1_mode and path2_mode to STV0900_SRIAL_PUNCT_CLOCK.
-rw-r--r--linux/drivers/media/dvb/frontends/stv090x.c2
-rw-r--r--linux/drivers/media/video/ngene/ngene-core.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv090x.c b/linux/drivers/media/dvb/frontends/stv090x.c
index 7283a8d69..8b152bea3 100644
--- a/linux/drivers/media/dvb/frontends/stv090x.c
+++ b/linux/drivers/media/dvb/frontends/stv090x.c
@@ -888,9 +888,7 @@ static struct stv090x_reg stv0900_initval[] = {
{ STV090x_AGCRF1CFG, 0x11 },
{ STV090x_AGCRF2CFG, 0x13 },
{ STV090x_TSGENERAL1X, 0x14 },
- { STV090x_TSTTNR1, 0x26 },
{ STV090x_TSTTNR2, 0x21 },
- { STV090x_TSTTNR3, 0x26 },
{ STV090x_TSTTNR4, 0x21 },
{ STV090x_P2_DISTXCTL, 0x22 },
{ STV090x_P2_F22TX, 0xc0 },
diff --git a/linux/drivers/media/video/ngene/ngene-core.c b/linux/drivers/media/video/ngene/ngene-core.c
index 6b01127ef..3d37ec8b4 100644
--- a/linux/drivers/media/video/ngene/ngene-core.c
+++ b/linux/drivers/media/video/ngene/ngene-core.c
@@ -4191,6 +4191,7 @@ static struct stv6110x_config tuner_mps2_1 = {
};
#else
+#if 0
static struct stv0900_reg stv0900_regs[] = {
// { R0900_TSGENERAL, 0x00 },
//GPIO:
@@ -4232,6 +4233,7 @@ static struct stv0900_reg stv0900_regs[] = {
{ 0xffff, 0xff }, /* terminate */
};
+#endif
static struct stv0900_config fe_mps2 = {
.demod_address = 0x68,
@@ -4243,9 +4245,9 @@ static struct stv0900_config fe_mps2 = {
* STV0900_SERIAL_CONT_CLOCK = 2,
* STV0900_PARALLEL_PUNCT_CLOCK = 3,
* STV0900_DVBCI_CLOCK = 4 */
-// .path1_mode = 1, /* => TSCFGH.TSFIFO_SERIAL & TSCFGH.TSFIFO_DVBCI */
-// .path2_mode = 1, /* => TSCFGH.TSFIFO_SERIAL & TSCFGH.TSFIFO_DVBCI */
- .ts_config_regs = stv0900_regs,
+ .path1_mode = 1, /* => TSCFGH.TSFIFO_SERIAL & TSCFGH.TSFIFO_DVBCI */
+ .path2_mode = 1, /* => TSCFGH.TSFIFO_SERIAL & TSCFGH.TSFIFO_DVBCI */
+ .ts_config_regs = NULL,
.tun1_maddress = 0, /* 0x60 */
.tun2_maddress = 3, /* 0x63 */
.tun1_adc = 1, /* => if 1 TSTTNR1=0x26 */
@@ -4255,13 +4257,13 @@ static struct stv0900_config fe_mps2 = {
static struct stv6110_config tuner_mps2_0 = {
.i2c_address = 0x60,
.mclk = 27000000, /* => CTRL1.K */
- .clk_div = 1, /* => CTRL2.CO_DIV */
+ .clk_div = 0, /* => CTRL2.CO_DIV */
};
static struct stv6110_config tuner_mps2_1 = {
.i2c_address = 0x63,
.mclk = 27000000, /* => CTRL1.K */
- .clk_div = 1, /* => CTRL2.CO_DIV */
+ .clk_div = 0, /* => CTRL2.CO_DIV */
};
#endif /* NGENE_STV090X */