V4L/DVB (7569): Added support for SkyStar2 rev2.7 and ITD1000 DVB-S tuner

This patches adds support for the SkyStar2 rev2.7 with the PN1010/ITD1000 Frontend.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 51 insertions, 0 deletions

diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index 8193d88d171c..6ec5afba1ca7 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -10,6 +10,8 @@ config DVB_B2C2_FLEXCOP
         select DVB_BCM3510 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+        select DVB_S5H1420 if !DVB_FE_CUSTOMISE
+        select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
         select DVB_CX24123 if !DVB_FE_CUSTOMISE
         help
diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/dvb/b2c2/Makefile
index 7d5334106d5a..870e2848c296 100644
--- a/drivers/media/dvb/b2c2/Makefile
+++ b/drivers/media/dvb/b2c2/Makefile
@@ -2,6 +2,7 @@ b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \
         flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
 
+
 ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),)
 b2c2-flexcop-objs += flexcop-dma.o
 endif
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 6759c3ad234a..04989b7a165c 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -19,6 +19,9 @@
 #include "dvb-pll.h"
 #include "tuner-simple.h"
 
+#include "s5h1420.h"
+#include "itd1000.h"
+
 #include "cx24123.h"
 #include "cx24113.h"
 
@@ -482,6 +485,18 @@ static struct stv0297_config alps_tdee4_stv0297_config = {
 };
 
 
+/* SkyStar2 rev2.7 (a/u) */
+static struct s5h1420_config skystar2_rev2_7_s5h1420_config = {
+        .demod_address = 0x53,
+        .invert = 1,
+        .repeated_start_workaround = 1,
+};
+
+static struct itd1000_config skystar2_rev2_7_itd1000_config = {
+        .i2c_address = 0x61,
+};
+
+/* SkyStar2 rev2.8 */
 static struct cx24123_config skystar2_rev2_8_cx24123_config = {
         .demod_address = 0x55,
         .dont_use_pll = 1,
@@ -500,6 +515,39 @@ int flexcop_frontend_init(struct flexcop_device *fc)
         struct i2c_adapter *i2c = &fc->fc_i2c_adap[0].i2c_adap;
         struct i2c_adapter *i2c_tuner;
 
+        /* enable no_base_addr - no repeated start when reading */
+        fc->fc_i2c_adap[0].no_base_addr = 1;
+        fc->fe = dvb_attach(s5h1420_attach, &skystar2_rev2_7_s5h1420_config, i2c);
+        if (fc->fe != NULL) {
+                flexcop_ibi_value r108;
+                i2c_tuner = s5h1420_get_tuner_i2c_adapter(fc->fe);
+                ops = &fc->fe->ops;
+
+                fc->fe_sleep = ops->sleep;
+                ops->sleep   = flexcop_sleep;
+
+                fc->dev_type = FC_SKY_REV27;
+
+                /* enable no_base_addr - no repeated start when reading */
+                fc->fc_i2c_adap[2].no_base_addr = 1;
+                if (dvb_attach(isl6421_attach, fc->fe, &fc->fc_i2c_adap[2].i2c_adap, 0x08, 1, 1) == NULL)
+                        err("ISL6421 could NOT be attached");
+                else
+                        info("ISL6421 successfully attached");
+
+                /* the ITD1000 requires a lower i2c clock - it slows down the stuff for everyone - but is it a problem ? */
+                r108.raw = 0x00000506;
+                fc->write_ibi_reg(fc, tw_sm_c_108, r108);
+                if (i2c_tuner) {
+                        if (dvb_attach(itd1000_attach, fc->fe, i2c_tuner, &skystar2_rev2_7_itd1000_config) == NULL)
+                                err("ITD1000 could NOT be attached");
+                        else
+                                info("ITD1000 successfully attached");
+                }
+                goto fe_found;
+        }
+        fc->fc_i2c_adap[0].no_base_addr = 0; /* for the next devices we need it again */
+
         /* try the sky v2.8 (cx24123, isl6421) */
         fc->fe = dvb_attach(cx24123_attach,
                 &skystar2_rev2_8_cx24123_config, i2c);