summaryrefslogtreecommitdiff
path: root/drivers/media/dvb/dm1105/dm1105.c
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@me.by>2008-09-23 15:43:57 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:37:07 -0200
commite4aab64cb78a42e45e1d387f272712e06cf89a66 (patch)
tree71085956cf8364b5a49723c9812cd18a54bbb792 /drivers/media/dvb/dm1105/dm1105.c
parent8316568930074723bdc47d6777f822be0422a5b7 (diff)
V4L/DVB (9026): Add support for ST STV0288 demodulator and cards with it.
Add support for ST STV0288 demodulator and cards with it, such as TeVii S420. Patch is co-authored with Georg Acher <acher@baycom.de> Signed-off-by: Georg Acher <acher@baycom.de> Signed-off-by: Igor M. Liplianin <liplianin@me.by> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dm1105/dm1105.c')
-rw-r--r--drivers/media/dvb/dm1105/dm1105.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 0c1790fe2b56..f7321448b4b1 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -39,8 +39,8 @@
#include "dvb-pll.h"
#include "stv0299.h"
-/*#include "stv0288.h"
- *#include "stb6000.h"*/
+#include "stv0288.h"
+#include "stb6000.h"
#include "si21xx.h"
#include "cx24116.h"
#include "z0194a.h"
@@ -594,13 +594,12 @@ static void dm1105dvb_hw_exit(struct dm1105dvb *dm1105dvb)
dm1105dvb_dma_unmap(dm1105dvb);
}
-#if 0
+
static struct stv0288_config earda_config = {
.demod_address = 0x68,
.min_delay_ms = 100,
};
-#endif /* keep */
static struct si21xx_config serit_config = {
.demod_address = 0x68,
.min_delay_ms = 100,
@@ -627,7 +626,7 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
dvb_attach(dvb_pll_attach, dm1105dvb->fe, 0x60,
&dm1105dvb->i2c_adap, DVB_PLL_OPERA1);
}
-#if 0
+
if (!dm1105dvb->fe) {
dm1105dvb->fe = dvb_attach(
stv0288_attach, &earda_config,
@@ -639,7 +638,7 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
&dm1105dvb->i2c_adap);
}
}
-#endif /* keep */
+
if (!dm1105dvb->fe) {
dm1105dvb->fe = dvb_attach(
si21xx_attach, &serit_config,