Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 90 insertions, 24 deletions

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index c5c7672cd538..2e398090cf63 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -34,6 +34,7 @@
 #include "dvb_frontend.h"
 #include "dvb-bt8xx.h"
 #include "bt878.h"
+#include "dvb-pll.h"
 
 static int debug;
 
@@ -279,7 +280,7 @@ static int microtune_mt7202dtf_pll_set(struct dvb_frontend* fe, struct dvb_front
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
         data[2] = ((div >> 10) & 0x60) | cfg;
-        data[3] = cpump | band_select;
+        data[3] = (cpump << 6) | band_select;
 
         i2c_transfer(card->i2c_adapter, &msg, 1);
         return (div * 166666 - 36000000);
@@ -522,9 +523,7 @@ static void digitv_alps_tded4_reset(struct dvb_bt8xx_card *bt)
         /*
          * Reset the frontend, must be called before trying
          * to initialise the MT352 or mt352_attach
-         * will fail.
-         *
-         * Presumably not required for the NXT6000 frontend.
+         * will fail. Same goes for the nxt6000 frontend.
          *
          */
 
@@ -546,14 +545,63 @@ static struct mt352_config digitv_alps_tded4_config = {
         .pll_set = digitv_alps_tded4_pll_set,
 };
 
+static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+{
+        struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv;
+        u8 buf[4];
+        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
+        int err;
+
+        dvb_pll_configure(&dvb_pll_tdvs_tua6034, buf, params->frequency, 0);
+        dprintk("%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(card->i2c_adapter, &msg, 1)) != 1) {
+                printk(KERN_WARNING "dvb-bt8xx: %s error "
+                        "(addr %02x <- %02x, err = %i)\n",
+                        __FUNCTION__, buf[0], buf[1], err);
+                if (err < 0)
+                        return err;
+                else
+                        return -EREMOTEIO;
+        }
+
+        /* Set the Auxiliary Byte. */
+        buf[2] &= ~0x20;
+        buf[2] |= 0x18;
+        buf[3] = 0x50;
+        i2c_transfer(card->i2c_adapter, &msg, 1);
+
+        return 0;
+}
+
+static struct lgdt330x_config tdvs_tua6034_config = {
+        .demod_address    = 0x0e,
+        .demod_chip       = LGDT3303,
+        .serial_mpeg      = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
+        .pll_set          = tdvs_tua6034_pll_set,
+};
+
+static void lgdt330x_reset(struct dvb_bt8xx_card *bt)
+{
+        /* Set pin 27 of the lgdt3303 chip high to reset the frontend */
+
+        /* Pulse the reset line */
+        bttv_write_gpio(bt->bttv_nr, 0x00e00007, 0x00000001); /* High */
+        bttv_write_gpio(bt->bttv_nr, 0x00e00007, 0x00000000); /* Low  */
+        msleep(100);
+
+        bttv_write_gpio(bt->bttv_nr, 0x00e00007, 0x00000001); /* High */
+        msleep(100);
+}
+
 static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
 {
         int ret;
         struct dst_state* state = NULL;
 
         switch(type) {
-#ifdef BTTV_DVICO_DVBT_LITE
-        case BTTV_DVICO_DVBT_LITE:
+#ifdef BTTV_BOARD_DVICO_DVBT_LITE
+        case BTTV_BOARD_DVICO_DVBT_LITE:
                 card->fe = mt352_attach(&thomson_dtt7579_config, card->i2c_adapter);
                 if (card->fe != NULL) {
                         card->fe->ops->info.frequency_min = 174000000;
@@ -562,10 +610,19 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                 break;
 #endif
 
-#ifdef BTTV_TWINHAN_VP3021
-        case BTTV_TWINHAN_VP3021:
+#ifdef BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE
+        case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE:
+                lgdt330x_reset(card);
+                card->fe = lgdt330x_attach(&tdvs_tua6034_config, card->i2c_adapter);
+                if (card->fe != NULL)
+                        dprintk ("dvb_bt8xx: lgdt330x detected\n");
+                break;
+#endif
+
+#ifdef BTTV_BOARD_TWINHAN_VP3021
+        case BTTV_BOARD_TWINHAN_VP3021:
 #else
-        case BTTV_NEBULA_DIGITV:
+        case BTTV_BOARD_NEBULA_DIGITV:
 #endif
                 /*
                  * It is possible to determine the correct frontend using the I2C bus (see the Nebula SDK);
@@ -573,6 +630,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                  */
 
                 /* Old Nebula (marked (c)2003 on high profile pci card) has nxt6000 demod */
+                digitv_alps_tded4_reset(card);
                 card->fe = nxt6000_attach(&vp3021_alps_tded4_config, card->i2c_adapter);
                 if (card->fe != NULL) {
                         dprintk ("dvb_bt8xx: an nxt6000 was detected on your digitv card\n");
@@ -587,11 +645,11 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                         dprintk ("dvb_bt8xx: an mt352 was detected on your digitv card\n");
                 break;
 
-        case BTTV_AVDVBT_761:
+        case BTTV_BOARD_AVDVBT_761:
                 card->fe = sp887x_attach(&microtune_mt7202dtf_config, card->i2c_adapter);
                 break;
 
-        case BTTV_AVDVBT_771:
+        case BTTV_BOARD_AVDVBT_771:
                 card->fe = mt352_attach(&advbt771_samsung_tdtc9251dh0_config, card->i2c_adapter);
                 if (card->fe != NULL) {
                         card->fe->ops->info.frequency_min = 174000000;
@@ -599,7 +657,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                 }
                 break;
 
-        case BTTV_TWINHAN_DST:
+        case BTTV_BOARD_TWINHAN_DST:
                 /*      DST is not a frontend driver !!!                */
                 state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL);
                 /*      Setup the Card                                  */
@@ -620,11 +678,11 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                         ret = dst_ca_attach(state, &card->dvb_adapter);
                 break;
 
-        case BTTV_PINNACLESAT:
+        case BTTV_BOARD_PINNACLESAT:
                 card->fe = cx24110_attach(&pctvsat_config, card->i2c_adapter);
                 break;
 
-        case BTTV_PC_HDTV:
+        case BTTV_BOARD_PC_HDTV:
                 card->fe = or51211_attach(&or51211_config, card->i2c_adapter);
                 break;
         }
@@ -746,7 +804,7 @@ static int dvb_bt8xx_probe(struct device *dev)
         card->i2c_adapter = &sub->core->i2c_adap;
 
         switch(sub->core->type) {
-        case BTTV_PINNACLESAT:
+        case BTTV_BOARD_PINNACLESAT:
                 card->gpio_mode = 0x0400c060;
                 /* should be: BT878_A_GAIN=0,BT878_A_PWRDN,BT878_DA_DPM,BT878_DA_SBR,
                               BT878_DA_IOM=1,BT878_DA_APP to enable serial highspeed mode. */
@@ -754,8 +812,8 @@ static int dvb_bt8xx_probe(struct device *dev)
                 card->irq_err_ignore = 0;
                 break;
 
-#ifdef BTTV_DVICO_DVBT_LITE
-        case BTTV_DVICO_DVBT_LITE:
+#ifdef BTTV_BOARD_DVICO_DVBT_LITE
+        case BTTV_BOARD_DVICO_DVBT_LITE:
 #endif
                 card->gpio_mode = 0x0400C060;
                 card->op_sync_orin = 0;
@@ -765,26 +823,34 @@ static int dvb_bt8xx_probe(struct device *dev)
                  * DA_APP(parallel) */
                 break;
 
-#ifdef BTTV_TWINHAN_VP3021
-        case BTTV_TWINHAN_VP3021:
+#ifdef BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE
+        case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE:
+#endif
+                card->gpio_mode = 0x0400c060;
+                card->op_sync_orin = BT878_RISC_SYNC_MASK;
+                card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR;
+                break;
+
+#ifdef BTTV_BOARD_TWINHAN_VP3021
+        case BTTV_BOARD_TWINHAN_VP3021:
 #else
-        case BTTV_NEBULA_DIGITV:
+        case BTTV_BOARD_NEBULA_DIGITV:
 #endif
-        case BTTV_AVDVBT_761:
+        case BTTV_BOARD_AVDVBT_761:
                 card->gpio_mode = (1 << 26) | (1 << 14) | (1 << 5);
                 card->op_sync_orin = 0;
                 card->irq_err_ignore = 0;
                 /* A_PWRDN DA_SBR DA_APP (high speed serial) */
                 break;
 
-        case BTTV_AVDVBT_771: //case 0x07711461:
+        case BTTV_BOARD_AVDVBT_771: //case 0x07711461:
                 card->gpio_mode = 0x0400402B;
                 card->op_sync_orin = BT878_RISC_SYNC_MASK;
                 card->irq_err_ignore = 0;
                 /* A_PWRDN DA_SBR  DA_APP[0] PKTP=10 RISC_ENABLE FIFO_ENABLE*/
                 break;
 
-        case BTTV_TWINHAN_DST:
+        case BTTV_BOARD_TWINHAN_DST:
                 card->gpio_mode = 0x2204f2c;
                 card->op_sync_orin = BT878_RISC_SYNC_MASK;
                 card->irq_err_ignore = BT878_APABORT | BT878_ARIPERR |
@@ -802,7 +868,7 @@ static int dvb_bt8xx_probe(struct device *dev)
                  * RISC+FIFO ENABLE */
                 break;
 
-        case BTTV_PC_HDTV:
+        case BTTV_BOARD_PC_HDTV:
                 card->gpio_mode = 0x0100EC7B;
                 card->op_sync_orin = 0;
                 card->irq_err_ignore = 0;