1 files changed, 137 insertions, 98 deletions

diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 0beb370792ae..ab0c032472cc 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -49,10 +49,8 @@ struct tda1004x_state {
         /* private demod data */
         u8 initialised;
         enum tda1004x_demod demod_type;
-        u8 fw_version;
 };
 
-
 static int debug;
 #define dprintk(args...) \
         do { \
@@ -122,6 +120,8 @@ static int debug;
 #define TDA10046H_GPIO_OUT_SEL   0x41
 #define TDA10046H_GPIO_SELECT    0x42
 #define TDA10046H_AGC_CONF       0x43
+#define TDA10046H_AGC_THR        0x44
+#define TDA10046H_AGC_RENORM     0x45
 #define TDA10046H_AGC_GAINS      0x46
 #define TDA10046H_AGC_TUN_MIN    0x47
 #define TDA10046H_AGC_TUN_MAX    0x48
@@ -274,14 +274,26 @@ static int tda10046h_set_bandwidth(struct tda1004x_state *state,
         switch (bandwidth) {
         case BANDWIDTH_6_MHZ:
                 tda1004x_write_buf(state, TDA10046H_TIME_WREF1, bandwidth_6mhz, sizeof(bandwidth_6mhz));
+                if (state->config->if_freq == TDA10046_FREQ_045) {
+                        tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0x09);
+                        tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x4f);
+                }
                 break;
 
         case BANDWIDTH_7_MHZ:
                 tda1004x_write_buf(state, TDA10046H_TIME_WREF1, bandwidth_7mhz, sizeof(bandwidth_7mhz));
+                if (state->config->if_freq == TDA10046_FREQ_045) {
+                        tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0x0a);
+                        tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x79);
+                }
                 break;
 
         case BANDWIDTH_8_MHZ:
                 tda1004x_write_buf(state, TDA10046H_TIME_WREF1, bandwidth_8mhz, sizeof(bandwidth_8mhz));
+                if (state->config->if_freq == TDA10046_FREQ_045) {
+                        tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0x0b);
+                        tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0xa3);
+                }
                 break;
 
         default:
@@ -315,20 +327,35 @@ static int tda1004x_do_upload(struct tda1004x_state *state,
                 memcpy(buf + 1, mem + pos, tx_size);
                 fw_msg.len = tx_size + 1;
                 if (i2c_transfer(state->i2c, &fw_msg, 1) != 1) {
-                        printk("tda1004x: Error during firmware upload\n");
+                        printk(KERN_ERR "tda1004x: Error during firmware upload\n");
                         return -EIO;
                 }
                 pos += tx_size;
 
                 dprintk("%s: fw_pos=0x%x\n", __FUNCTION__, pos);
         }
+        // give the DSP a chance to settle 03/10/05 Hac
+        msleep(100);
 
         return 0;
 }
 
-static int tda1004x_check_upload_ok(struct tda1004x_state *state, u8 dspVersion)
+static int tda1004x_check_upload_ok(struct tda1004x_state *state)
 {
         u8 data1, data2;
+        unsigned long timeout;
+
+        if (state->demod_type == TDA1004X_DEMOD_TDA10046) {
+                timeout = jiffies + 2 * HZ;
+                while(!(tda1004x_read_byte(state, TDA1004X_STATUS_CD) & 0x20)) {
+                        if (time_after(jiffies, timeout)) {
+                                printk(KERN_ERR "tda1004x: timeout waiting for DSP ready\n");
+                                break;
+                        }
+                        msleep(1);
+                }
+        } else
+                msleep(100);
 
         // check upload was OK
         tda1004x_write_mask(state, TDA1004X_CONFC4, 0x10, 0); // we want to read from the DSP
@@ -336,9 +363,11 @@ static int tda1004x_check_upload_ok(struct tda1004x_state *state, u8 dspVersion)
 
         data1 = tda1004x_read_byte(state, TDA1004X_DSP_DATA1);
         data2 = tda1004x_read_byte(state, TDA1004X_DSP_DATA2);
-        if ((data1 != 0x67) || (data2 != dspVersion))
+        if (data1 != 0x67 || data2 < 0x20 || data2 > 0x2e) {
+                printk(KERN_INFO "tda1004x: found firmware revision %x -- invalid\n", data2);
                 return -EIO;
-
+        }
+        printk(KERN_INFO "tda1004x: found firmware revision %x -- ok\n", data2);
         return 0;
 }
 
@@ -349,14 +378,14 @@ static int tda10045_fwupload(struct dvb_frontend* fe)
         const struct firmware *fw;
 
         /* don't re-upload unless necessary */
-        if (tda1004x_check_upload_ok(state, 0x2c) == 0)
+        if (tda1004x_check_upload_ok(state) == 0)
                 return 0;
 
         /* request the firmware, this will block until someone uploads it */
-        printk("tda1004x: waiting for firmware upload (%s)...\n", TDA10045_DEFAULT_FIRMWARE);
+        printk(KERN_INFO "tda1004x: waiting for firmware upload (%s)...\n", TDA10045_DEFAULT_FIRMWARE);
         ret = state->config->request_firmware(fe, &fw, TDA10045_DEFAULT_FIRMWARE);
         if (ret) {
-                printk("tda1004x: no firmware upload (timeout or file not found?)\n");
+                printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n");
                 return ret;
         }
 
@@ -370,95 +399,93 @@ static int tda10045_fwupload(struct dvb_frontend* fe)
         tda10045h_set_bandwidth(state, BANDWIDTH_8_MHZ);
 
         ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10045H_FWPAGE, TDA10045H_CODE_IN);
+        release_firmware(fw);
         if (ret)
                 return ret;
-        printk("tda1004x: firmware upload complete\n");
+        printk(KERN_INFO "tda1004x: firmware upload complete\n");
 
         /* wait for DSP to initialise */
         /* DSPREADY doesn't seem to work on the TDA10045H */
         msleep(100);
 
-        return tda1004x_check_upload_ok(state, 0x2c);
+        return tda1004x_check_upload_ok(state);
 }
 
-static int tda10046_get_fw_version(struct tda1004x_state *state,
-                                   const struct firmware *fw)
+static void tda10046_init_plls(struct dvb_frontend* fe)
 {
-        const unsigned char pattern[] = { 0x67, 0x00, 0x50, 0x62, 0x5e, 0x18, 0x67 };
-        unsigned int i;
-
-        /* area guessed from firmware v20, v21 and v25 */
-        for (i = 0x660; i < 0x700; i++) {
-                if (!memcmp(&fw->data[i], pattern, sizeof(pattern))) {
-                        state->fw_version = fw->data[i + sizeof(pattern)];
-                        printk(KERN_INFO "tda1004x: using firmware v%02x\n",
-                                        state->fw_version);
-                        return 0;
-                }
-        }
+        struct tda1004x_state* state = fe->demodulator_priv;
 
-        return -EINVAL;
+        tda1004x_write_byteI(state, TDA10046H_CONFPLL1, 0xf0);
+        tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 10); // PLL M = 10
+        if (state->config->xtal_freq == TDA10046_XTAL_4M ) {
+                dprintk("%s: setting up PLLs for a 4 MHz Xtal\n", __FUNCTION__);
+                tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0); // PLL P = N = 0
+        } else {
+                dprintk("%s: setting up PLLs for a 16 MHz Xtal\n", __FUNCTION__);
+                tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 3); // PLL P = 0, N = 3
+        }
+        tda1004x_write_byteI(state, TDA10046H_FREQ_OFFSET, 99);
+        switch (state->config->if_freq) {
+        case TDA10046_FREQ_3617:
+                tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0xd4);
+                tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x2c);
+                break;
+        case TDA10046_FREQ_3613:
+                tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0xd4);
+                tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x13);
+                break;
+        case TDA10046_FREQ_045:
+                tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0x0b);
+                tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0xa3);
+                break;
+        case TDA10046_FREQ_052:
+                tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0x0c);
+                tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x06);
+                break;
+        }
+        tda10046h_set_bandwidth(state, BANDWIDTH_8_MHZ); // default bandwidth 8 MHz
 }
 
 static int tda10046_fwupload(struct dvb_frontend* fe)
 {
         struct tda1004x_state* state = fe->demodulator_priv;
-        unsigned long timeout;
         int ret;
         const struct firmware *fw;
 
         /* reset + wake up chip */
-        tda1004x_write_mask(state, TDA1004X_CONFC4, 1, 0);
+        tda1004x_write_byteI(state, TDA1004X_CONFC4, 0);
         tda1004x_write_mask(state, TDA10046H_CONF_TRISTATE1, 1, 0);
-        msleep(100);
+        /* let the clocks recover from sleep */
+        msleep(5);
 
         /* don't re-upload unless necessary */
-        if (tda1004x_check_upload_ok(state, state->fw_version) == 0)
+        if (tda1004x_check_upload_ok(state) == 0)
                 return 0;
 
-        /* request the firmware, this will block until someone uploads it */
-        printk("tda1004x: waiting for firmware upload (%s)...\n", TDA10046_DEFAULT_FIRMWARE);
-        ret = state->config->request_firmware(fe, &fw, TDA10046_DEFAULT_FIRMWARE);
-        if (ret) {
-                printk("tda1004x: no firmware upload (timeout or file not found?)\n");
-                return ret;
-        }
-
-        if (fw->size < 24478) { /* size of firmware v20, which is the smallest of v20, v21 and v25 */
-                printk("tda1004x: firmware file seems to be too small (%d bytes)\n", fw->size);
-                return -EINVAL;
-        }
-
-        ret = tda10046_get_fw_version(state, fw);
-        if (ret < 0) {
-                printk("tda1004x: unable to find firmware version\n");
-                return ret;
-        }
-
         /* set parameters */
-        tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 10);
-        tda1004x_write_byteI(state, TDA10046H_CONFPLL3, state->config->n_i2c);
-        tda1004x_write_byteI(state, TDA10046H_FREQ_OFFSET, 99);
-        tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0xd4);
-        tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x2c);
-        tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8); // going to boot from HOST
-
-        ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN);
-        if (ret)
-                return ret;
-        printk("tda1004x: firmware upload complete\n");
-
-        /* wait for DSP to initialise */
-        timeout = jiffies + HZ;
-        while (!(tda1004x_read_byte(state, TDA1004X_STATUS_CD) & 0x20)) {
-                if (time_after(jiffies, timeout)) {
-                        printk("tda1004x: DSP failed to initialised.\n");
-                        return -EIO;
+        tda10046_init_plls(fe);
+
+        if (state->config->request_firmware != NULL) {
+                /* request the firmware, this will block until someone uploads it */
+                printk(KERN_INFO "tda1004x: waiting for firmware upload...\n");
+                ret = state->config->request_firmware(fe, &fw, TDA10046_DEFAULT_FIRMWARE);
+                if (ret) {
+                        printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n");
+                        return ret;
                 }
-                msleep(1);
+                tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8); // going to boot from HOST
+                ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN);
+                release_firmware(fw);
+                if (ret)
+                        return ret;
+        } else {
+                /* boot from firmware eeprom */
+                /* Hac Note: we might need to do some GPIO Magic here */
+                printk(KERN_INFO "tda1004x: booting from eeprom\n");
+                tda1004x_write_mask(state, TDA1004X_CONFC4, 4, 4);
+                msleep(300);
         }
-
-        return tda1004x_check_upload_ok(state, state->fw_version);
+        return tda1004x_check_upload_ok(state);
 }
 
 static int tda1004x_encode_fec(int fec)
@@ -560,12 +587,10 @@ static int tda10046_init(struct dvb_frontend* fe)
 
         if (tda10046_fwupload(fe)) {
                 printk("tda1004x: firmware upload failed\n");
-                return -EIO;
+                        return -EIO;
         }
 
-        tda1004x_write_mask(state, TDA1004X_CONFC4, 1, 0); // wake up the chip
-
-        // Init the PLL
+        // Init the tuner PLL
         if (state->config->pll_init) {
                 tda1004x_enable_tuner_i2c(state);
                 state->config->pll_init(fe);
@@ -574,32 +599,44 @@ static int tda10046_init(struct dvb_frontend* fe)
 
         // tda setup
         tda1004x_write_mask(state, TDA1004X_CONFC4, 0x20, 0); // disable DSP watchdog timer
-        tda1004x_write_mask(state, TDA1004X_CONFC1, 0x40, 0x40);
-        tda1004x_write_mask(state, TDA1004X_AUTO, 8, 0); // select HP stream
-        tda1004x_write_mask(state, TDA1004X_CONFC1, 0x80, 0); // disable pulse killer
-        tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 10); // PLL M = 10
-        tda1004x_write_byteI(state, TDA10046H_CONFPLL3, state->config->n_i2c); // PLL P = N = 0
-        tda1004x_write_byteI(state, TDA10046H_FREQ_OFFSET, 99); // FREQOFFS = 99
-        tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0xd4); // } PHY2 = -11221
-        tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x2c); // }
-        tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0); // AGC setup
-        tda1004x_write_mask(state, TDA10046H_CONF_POLARITY, 0x60, 0x60); // set AGC polarities
+        tda1004x_write_byteI(state, TDA1004X_AUTO, 7); // select HP stream
+        tda1004x_write_byteI(state, TDA1004X_CONFC1, 8); // disable pulse killer
+
+        tda10046_init_plls(fe);
+        switch (state->config->agc_config) {
+        case TDA10046_AGC_DEFAULT:
+                tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x00); // AGC setup
+                tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x60); // set AGC polarities
+                break;
+        case TDA10046_AGC_IFO_AUTO_NEG:
+                tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x0a); // AGC setup
+                tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x60); // set AGC polarities
+                break;
+        case TDA10046_AGC_IFO_AUTO_POS:
+                tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x0a); // AGC setup
+                tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x00); // set AGC polarities
+                break;
+        case TDA10046_AGC_TDA827X:
+                tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x02);   // AGC setup
+                tda1004x_write_byteI(state, TDA10046H_AGC_THR, 0x70);    // AGC Threshold
+                tda1004x_write_byteI(state, TDA10046H_AGC_RENORM, 0x0E); // Gain Renormalize
+                tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x60); // set AGC polarities
+                break;
+        }
+        tda1004x_write_byteI(state, TDA10046H_CONF_TRISTATE1, 0x61); // Turn both AGC outputs on
         tda1004x_write_byteI(state, TDA10046H_AGC_TUN_MIN, 0);    // }
         tda1004x_write_byteI(state, TDA10046H_AGC_TUN_MAX, 0xff); // } AGC min/max values
         tda1004x_write_byteI(state, TDA10046H_AGC_IF_MIN, 0);     // }
         tda1004x_write_byteI(state, TDA10046H_AGC_IF_MAX, 0xff);  // }
-        tda1004x_write_mask(state, TDA10046H_CVBER_CTRL, 0x30, 0x10); // 10^6 VBER measurement bits
         tda1004x_write_byteI(state, TDA10046H_AGC_GAINS, 1); // IF gain 2, TUN gain 1
-        tda1004x_write_mask(state, TDA1004X_AUTO, 0x80, 0); // crystal is 50ppm
+        tda1004x_write_byteI(state, TDA10046H_CVBER_CTRL, 0x1a); // 10^6 VBER measurement bits
         tda1004x_write_byteI(state, TDA1004X_CONF_TS1, 7); // MPEG2 interface config
-        tda1004x_write_mask(state, TDA1004X_CONF_TS2, 0x31, 0); // MPEG2 interface config
-        tda1004x_write_mask(state, TDA10046H_CONF_TRISTATE1, 0x9e, 0); // disable AGC_TUN
+        tda1004x_write_byteI(state, TDA1004X_CONF_TS2, 0xc0); // MPEG2 interface config
+        tda1004x_write_mask(state, 0x3a, 0x80, state->config->invert_oclk << 7);
+
         tda1004x_write_byteI(state, TDA10046H_CONF_TRISTATE2, 0xe1); // tristate setup
         tda1004x_write_byteI(state, TDA10046H_GPIO_OUT_SEL, 0xcc); // GPIO output config
-        tda1004x_write_mask(state, TDA10046H_GPIO_SELECT, 8, 8); // GPIO select
-        tda10046h_set_bandwidth(state, BANDWIDTH_8_MHZ); // default bandwidth 8 MHz
-
-        tda1004x_write_mask(state, 0x3a, 0x80, state->config->invert_oclk << 7);
+        tda1004x_write_byteI(state, TDA10046H_GPIO_SELECT, 8); // GPIO select
 
         state->initialised = 1;
         return 0;
@@ -629,9 +666,6 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,
         state->config->pll_set(fe, fe_params);
         tda1004x_disable_tuner_i2c(state);
 
-        if (state->demod_type == TDA1004X_DEMOD_TDA10046)
-                tda1004x_write_mask(state, TDA10046H_AGC_CONF, 4, 4);
-
         // Hardcoded to use auto as much as possible on the TDA10045 as it
         // is very unreliable if AUTO mode is _not_ used.
         if (state->demod_type == TDA1004X_DEMOD_TDA10045) {
@@ -1089,6 +1123,11 @@ static int tda1004x_sleep(struct dvb_frontend* fe)
                 break;
 
         case TDA1004X_DEMOD_TDA10046:
+                if (state->config->pll_sleep != NULL) {
+                        tda1004x_enable_tuner_i2c(state);
+                        state->config->pll_sleep(fe);
+                        tda1004x_disable_tuner_i2c(state);
+                }
                 tda1004x_write_mask(state, TDA1004X_CONFC4, 1, 1);
                 break;
         }
@@ -1100,8 +1139,9 @@ static int tda1004x_sleep(struct dvb_frontend* fe)
 static int tda1004x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
         fesettings->min_delay_ms = 800;
-        fesettings->step_size = 166667;
-        fesettings->max_drift = 166667*2;
+        /* Drift compensation makes no sense for DVB-T */
+        fesettings->step_size = 0;
+        fesettings->max_drift = 0;
         return 0;
 }
 
@@ -1216,7 +1256,6 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
         memcpy(&state->ops, &tda10046_ops, sizeof(struct dvb_frontend_ops));
         state->initialised = 0;
         state->demod_type = TDA1004X_DEMOD_TDA10046;
-        state->fw_version = 0x20;       /* dummy default value */
 
         /* check if the demod is there */
         if (tda1004x_read_byte(state, TDA1004X_CHIPID) != 0x46) {