Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 261527
b: refs/heads/master
c: dbe8740
h: refs/heads/master
i:
  261525: 2c5b689
  261523: 3be000a
  261519: 07ffb8a
v: v3
  • Loading branch information
Carlos Corbacho authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent d93014f commit 9295440
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 01434faf6d82f791c701d299f898bf261a724342
refs/heads/master: dbe8740ddecfbeb81d97dd6e85e0298081a6085d
13 changes: 12 additions & 1 deletion trunk/drivers/media/video/saa7134/saa7134-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -4951,8 +4951,9 @@ struct saa7134_board saa7134_boards[] = {
.audio_clock = 0x00187de7,
.tuner_type = TUNER_XC2028,
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.tuner_addr = 0x61,
.radio_addr = ADDR_UNSET,
.mpeg = SAA7134_MPEG_DVB,
.inputs = {{
.name = name_tv,
.vmux = 3,
Expand Down Expand Up @@ -6992,6 +6993,11 @@ static int saa7134_xc2028_callback(struct saa7134_dev *dev,
msleep(10);
saa7134_set_gpio(dev, 18, 1);
break;
case SAA7134_BOARD_VIDEOMATE_T750:
saa7134_set_gpio(dev, 20, 0);
msleep(10);
saa7134_set_gpio(dev, 20, 1);
break;
}
return 0;
}
Expand Down Expand Up @@ -7451,6 +7457,11 @@ int saa7134_board_init1(struct saa7134_dev *dev)
saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x0e050000, 0x0c050000);
saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x0e050000, 0x0c050000);
break;
case SAA7134_BOARD_VIDEOMATE_T750:
/* enable the analog tuner */
saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x00008000, 0x00008000);
saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00008000, 0x00008000);
break;
}
return 0;
}
Expand Down
25 changes: 25 additions & 0 deletions trunk/drivers/media/video/saa7134/saa7134-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
#include "lgs8gxx.h"

#include "zl10353.h"
#include "qt1010.h"

#include "zl10036.h"
#include "zl10039.h"
Expand Down Expand Up @@ -939,6 +940,18 @@ static struct zl10353_config behold_x7_config = {
.disable_i2c_gate_ctrl = 1,
};

static struct zl10353_config videomate_t750_zl10353_config = {
.demod_address = 0x0f,
.no_tuner = 1,
.parallel_ts = 1,
.disable_i2c_gate_ctrl = 1,
};

static struct qt1010_config videomate_t750_qt1010_config = {
.i2c_address = 0x62
};


/* ==================================================================
* tda10086 based DVB-S cards, helper functions
*/
Expand Down Expand Up @@ -1649,6 +1662,18 @@ static int dvb_init(struct saa7134_dev *dev)
wprintk("%s: No zl10039 found!\n",
__func__);

break;
case SAA7134_BOARD_VIDEOMATE_T750:
fe0->dvb.frontend = dvb_attach(zl10353_attach,
&videomate_t750_zl10353_config,
&dev->i2c_adap);
if (fe0->dvb.frontend != NULL) {
if (dvb_attach(qt1010_attach,
fe0->dvb.frontend,
&dev->i2c_adap,
&videomate_t750_qt1010_config) == NULL)
wprintk("error attaching QT1010\n");
}
break;
case SAA7134_BOARD_ZOLID_HYBRID_PCI:
fe0->dvb.frontend = dvb_attach(tda10048_attach,
Expand Down

0 comments on commit 9295440

Please sign in to comment.