7 files changed, 74 insertions, 3 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index bf5651b98bbb..a35330315f65 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -13,6 +13,8 @@
 #include "bcm3510.h"
 #include "stv0297.h"
 #include "mt312.h"
+#include "lgdt330x.h"
+#include "dvb-pll.h"
 
 /* lnb control */
 
@@ -295,6 +297,52 @@ static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct fir
         return request_firmware(fw, name, fc->dev);
 }
 
+static int lgdt3303_pll_set(struct dvb_frontend* fe,
+                            struct dvb_frontend_parameters* params)
+{
+        struct flexcop_device *fc = fe->dvb->priv;
+        u8 buf[4];
+        struct i2c_msg msg =
+                { .addr = 0x61, .flags = 0, .buf = buf, .len = 4 };
+        int err;
+
+        dvb_pll_configure(&dvb_pll_tdvs_tua6034,buf, params->frequency, 0);
+        dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
+                        __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
+        if ((err = i2c_transfer(&fc->i2c_adap, &msg, 1)) != 1) {
+                printk(KERN_WARNING "lgdt3303: %s error "
+                           "(addr %02x <- %02x, err = %i)\n",
+                           __FUNCTION__, buf[0], buf[1], err);
+                if (err < 0)
+                        return err;
+                else
+                        return -EREMOTEIO;
+        }
+
+        buf[0] = 0x86 | 0x18;
+        buf[1] = 0x50;
+        msg.len = 2;
+        if ((err = i2c_transfer(&fc->i2c_adap, &msg, 1)) != 1) {
+                printk(KERN_WARNING "lgdt3303: %s error "
+                           "(addr %02x <- %02x, err = %i)\n",
+                           __FUNCTION__, buf[0], buf[1], err);
+                if (err < 0)
+                        return err;
+                else
+                        return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+static struct lgdt330x_config air2pc_atsc_hd5000_config = {
+        .demod_address       = 0x59,
+        .demod_chip          = LGDT3303,
+        .serial_mpeg         = 0x04,
+        .pll_set             = lgdt3303_pll_set,
+        .clock_polarity_flip = 1,
+};
+
 static struct nxt2002_config samsung_tbmv_config = {
         .demod_address    = 0x0a,
         .request_firmware = flexcop_fe_request_firmware,
@@ -457,6 +505,11 @@ int flexcop_frontend_init(struct flexcop_device *fc)
                 fc->dev_type          = FC_AIR_ATSC2;
                 info("found the nxt2002 at i2c address: 0x%02x",samsung_tbmv_config.demod_address);
         } else
+        /* try the air atsc 3nd generation (lgdt3303) */
+        if ((fc->fe = lgdt330x_attach(&air2pc_atsc_hd5000_config, &fc->i2c_adap)) != NULL) {
+                fc->dev_type          = FC_AIR_ATSC3;
+                info("found the lgdt3303 at i2c address: 0x%02x",air2pc_atsc_hd5000_config.demod_address);
+        } else
         /* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */
         if ((fc->fe = bcm3510_attach(&air2pc_atsc_first_gen_config, &fc->i2c_adap)) != NULL) {
                 fc->dev_type          = FC_AIR_ATSC1;
diff --git a/drivers/media/dvb/b2c2/flexcop-misc.c b/drivers/media/dvb/b2c2/flexcop-misc.c
index 3a08d38b318a..62282d8dbfa8 100644
--- a/drivers/media/dvb/b2c2/flexcop-misc.c
+++ b/drivers/media/dvb/b2c2/flexcop-misc.c
@@ -51,6 +51,7 @@ const char *flexcop_device_names[] = {
         "Sky2PC/SkyStar 2 DVB-S",
         "Sky2PC/SkyStar 2 DVB-S (old version)",
         "Cable2PC/CableStar 2 DVB-C",
+        "Air2PC/AirStar 2 ATSC 3rd generation (HD5000)",
 };
 
 const char *flexcop_bus_names[] = {
diff --git a/drivers/media/dvb/b2c2/flexcop-reg.h b/drivers/media/dvb/b2c2/flexcop-reg.h
index 4ae1eb5bfe98..23cc6431e2b8 100644
--- a/drivers/media/dvb/b2c2/flexcop-reg.h
+++ b/drivers/media/dvb/b2c2/flexcop-reg.h
@@ -26,6 +26,7 @@ typedef enum {
         FC_SKY,
         FC_SKY_OLD,
         FC_CABLE,
+        FC_AIR_ATSC3,
 } flexcop_device_type_t;
 
 typedef enum {
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c
index 12873d435406..123ed96f6faa 100644
--- a/drivers/media/dvb/b2c2/flexcop.c
+++ b/drivers/media/dvb/b2c2/flexcop.c
@@ -193,6 +193,7 @@ static void flexcop_reset(struct flexcop_device *fc)
         v204 = fc->read_ibi_reg(fc,misc_204);
         v204.misc_204.Per_reset_sig = 0;
         fc->write_ibi_reg(fc,misc_204,v204);
+        msleep(1);
         v204.misc_204.Per_reset_sig = 1;
         fc->write_ibi_reg(fc,misc_204,v204);
 }
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index 536c35d969b7..6668839f9474 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -226,7 +226,7 @@ struct dvb_pll_desc dvb_pll_tua6034 = {
 EXPORT_SYMBOL(dvb_pll_tua6034);
 
 /* Infineon TUA6034
- * used in LG Innotek TDVS-H062F
+ * used in LG TDVS H061F and LG TDVS H062F
  */
 struct dvb_pll_desc dvb_pll_tdvs_tua6034 = {
         .name  = "LG/Infineon TUA6034",
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 145918877d2f..10fc4e7878af 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -27,6 +27,7 @@
  *   DViCO FusionHDTV 3 Gold-T
  *   DViCO FusionHDTV 5 Gold
  *   DViCO FusionHDTV 5 Lite
+ *   Air2PC/AirStar 2 ATSC 3rd generation (HD5000)
  *
  * TODO:
  * signal strength always returns 0.
@@ -223,6 +224,11 @@ static int lgdt330x_init(struct dvb_frontend* fe)
                 0x4c, 0x14
         };
 
+        static u8 flip_lgdt3303_init_data[] = {
+                0x4c, 0x14,
+                0x87, 0xf3
+        };
+
         struct lgdt330x_state* state = fe->demodulator_priv;
         char  *chip_name;
         int    err;
@@ -235,8 +241,13 @@ static int lgdt330x_init(struct dvb_frontend* fe)
                 break;
         case LGDT3303:
                 chip_name = "LGDT3303";
-                err = i2c_write_demod_bytes(state, lgdt3303_init_data,
-                                            sizeof(lgdt3303_init_data));
+                if (state->config->clock_polarity_flip) {
+                        err = i2c_write_demod_bytes(state, flip_lgdt3303_init_data,
+                                                    sizeof(flip_lgdt3303_init_data));
+                } else {
+                        err = i2c_write_demod_bytes(state, lgdt3303_init_data,
+                                                    sizeof(lgdt3303_init_data));
+                }
                 break;
         default:
                 chip_name = "undefined";
diff --git a/drivers/media/dvb/frontends/lgdt330x.h b/drivers/media/dvb/frontends/lgdt330x.h
index e209ba1e47c5..2a6529cccf1a 100644
--- a/drivers/media/dvb/frontends/lgdt330x.h
+++ b/drivers/media/dvb/frontends/lgdt330x.h
@@ -47,6 +47,10 @@ struct lgdt330x_config
 
         /* Need to set device param for start_dma */
         int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
+
+        /* Flip the polarity of the mpeg data transfer clock using alternate init data
+         * This option applies ONLY to LGDT3303 - 0:disabled (default) 1:enabled */
+        int clock_polarity_flip;
 };
 
 extern struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,