V4L/DVB (7471): SkyStar2: preparing support for the rev2.8

Support is prepared, but the CX24113-driver .c-file is missing. After sorting out the NDA problems, the file will be there immediatly.

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

4 files changed, 54 insertions, 0 deletions

diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index ffcbc761085..8193d88d171 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_ISL6421 if !DVB_FE_CUSTOMISE
+        select DVB_CX24123 if !DVB_FE_CUSTOMISE
         help
           Support for the digital TV receiver chip made by B2C2 Inc. included in
           Technisats PCI cards and USB boxes.
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 46d6f5d8cd1..6759c3ad234 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -19,6 +19,11 @@
 #include "dvb-pll.h"
 #include "tuner-simple.h"
 
+#include "cx24123.h"
+#include "cx24113.h"
+
+#include "isl6421.h"
+
 /* lnb control */
 
 static int flexcop_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
@@ -476,11 +481,54 @@ static struct stv0297_config alps_tdee4_stv0297_config = {
 //      .pll_set = alps_tdee4_stv0297_pll_set,
 };
 
+
+static struct cx24123_config skystar2_rev2_8_cx24123_config = {
+        .demod_address = 0x55,
+        .dont_use_pll = 1,
+        .agc_callback = cx24113_agc_callback,
+};
+
+static const struct cx24113_config skystar2_rev2_8_cx24113_config = {
+        .i2c_addr = 0x54,
+        .xtal_khz = 10111,
+};
+
 /* try to figure out the frontend, each card/box can have on of the following list */
 int flexcop_frontend_init(struct flexcop_device *fc)
 {
         struct dvb_frontend_ops *ops;
         struct i2c_adapter *i2c = &fc->fc_i2c_adap[0].i2c_adap;
+        struct i2c_adapter *i2c_tuner;
+
+        /* try the sky v2.8 (cx24123, isl6421) */
+        fc->fe = dvb_attach(cx24123_attach,
+                &skystar2_rev2_8_cx24123_config, i2c);
+        if (fc->fe != NULL) {
+                i2c_tuner = cx24123_get_tuner_i2c_adapter(fc->fe);
+                if (i2c_tuner != NULL) {
+                        if (dvb_attach(cx24113_attach, fc->fe,
+                                        &skystar2_rev2_8_cx24113_config,
+                                        i2c_tuner) == NULL)
+                                err("CX24113 could NOT be attached");
+                        else
+                                info("CX24113 successfully attached");
+                }
+
+                fc->dev_type = FC_SKY_REV28;
+
+                fc->fc_i2c_adap[2].no_base_addr = 1;
+                if (dvb_attach(isl6421_attach, fc->fe,
+                       &fc->fc_i2c_adap[2].i2c_adap, 0x08, 0, 0) == NULL)
+                        err("ISL6421 could NOT be attached");
+                else
+                        info("ISL6421 successfully attached");
+
+                /* TODO on i2c_adap[1] addr 0x11 (EEPROM) there seems to be an
+                 * IR-receiver (PIC16F818) - but the card has no input for
+                 * that ??? */
+
+                goto fe_found;
+    }
 
         /* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */
         fc->fe = dvb_attach(stv0299_attach, &samsung_tbmu24112_config, i2c);
diff --git a/drivers/media/dvb/b2c2/flexcop-misc.c b/drivers/media/dvb/b2c2/flexcop-misc.c
index 167583bf062..93d20e56f90 100644
--- a/drivers/media/dvb/b2c2/flexcop-misc.c
+++ b/drivers/media/dvb/b2c2/flexcop-misc.c
@@ -52,6 +52,8 @@ static const char *flexcop_device_names[] = {
         "Sky2PC/SkyStar 2 DVB-S (old version)",
         "Cable2PC/CableStar 2 DVB-C",
         "Air2PC/AirStar 2 ATSC 3rd generation (HD5000)",
+        "Sky2PC/SkyStar 2 DVB-S rev 2.7a/u",
+        "Sky2PC/SkyStar 2 DVB-S rev 2.8",
 };
 
 static const char *flexcop_bus_names[] = {
diff --git a/drivers/media/dvb/b2c2/flexcop-reg.h b/drivers/media/dvb/b2c2/flexcop-reg.h
index 491f9bd6e19..7599fccc1a5 100644
--- a/drivers/media/dvb/b2c2/flexcop-reg.h
+++ b/drivers/media/dvb/b2c2/flexcop-reg.h
@@ -25,6 +25,8 @@ typedef enum {
         FC_SKY_OLD,
         FC_CABLE,
         FC_AIR_ATSC3,
+        FC_SKY_REV27,
+        FC_SKY_REV28,
 } flexcop_device_type_t;
 
 typedef enum {