]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/media/video/tuner-xc2028.c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[linux-2.6-omap-h63xx.git] / drivers / media / video / tuner-xc2028.c
index c64eae2c7ec21e6f298194b328a9a63672a1fdd3..50cf876f020f40659929821f5c560fb58b5b8cbf 100644 (file)
@@ -22,6 +22,7 @@
 #include <linux/dvb/frontend.h>
 #include "dvb_frontend.h"
 
+
 #define PREFIX "xc2028"
 
 static int debug;
@@ -43,94 +44,108 @@ MODULE_PARM_DESC(audio_std,
        "NICAM/B\n");
 
 static LIST_HEAD(xc2028_list);
+static DEFINE_MUTEX(xc2028_list_mutex);
+
 /* struct for storing firmware table */
 struct firmware_description {
        unsigned int  type;
        v4l2_std_id   id;
+       __u16         int_freq;
        unsigned char *ptr;
        unsigned int  size;
 };
 
+struct firmware_properties {
+       unsigned int    type;
+       v4l2_std_id     id;
+       v4l2_std_id     std_req;
+       __u16           int_freq;
+       unsigned int    scode_table;
+       int             scode_nr;
+};
+
 struct xc2028_data {
        struct list_head        xc2028_list;
        struct tuner_i2c_props  i2c_props;
        int                     (*tuner_callback) (void *dev,
                                                   int command, int arg);
-       struct device           *dev;
        void                    *video_dev;
        int                     count;
        __u32                   frequency;
 
        struct firmware_description *firm;
        int                     firm_size;
+       __u16                   firm_version;
 
-       __u16                   version;
+       __u16                   hwmodel;
+       __u16                   hwvers;
 
        struct xc2028_ctrl      ctrl;
 
-       v4l2_std_id             firm_type;         /* video stds supported
-                                                       by current firmware */
-       fe_bandwidth_t          bandwidth;         /* Firmware bandwidth:
-                                                             6M, 7M or 8M */
-       int                     need_load_generic; /* The generic firmware
-                                                             were loaded? */
-
-       int                     max_len;        /* Max firmware chunk */
-
-       enum tuner_mode mode;
-       struct i2c_client       *i2c_client;
+       struct firmware_properties cur_fw;
 
        struct mutex lock;
 };
 
-#define i2c_send(rc, priv, buf, size) do {                             \
-       rc = tuner_i2c_xfer_send(&priv->i2c_props, buf, size);          \
-       if (size != rc)                                                 \
-               tuner_err("i2c output error: rc = %d (should be %d)\n", \
-                          rc, (int)size);                              \
-} while (0)
-
-#define i2c_rcv(rc, priv, buf, size) do {                              \
-       rc = tuner_i2c_xfer_recv(&priv->i2c_props, buf, size);          \
-       if (size != rc)                                                 \
+#define i2c_send(priv, buf, size) ({                                   \
+       int _rc;                                                        \
+       _rc = tuner_i2c_xfer_send(&priv->i2c_props, buf, size);         \
+       if (size != _rc)                                                \
+               tuner_info("i2c output error: rc = %d (should be %d)\n",\
+                          _rc, (int)size);                             \
+       _rc;                                                            \
+})
+
+#define i2c_rcv(priv, buf, size) ({                                    \
+       int _rc;                                                        \
+       _rc = tuner_i2c_xfer_recv(&priv->i2c_props, buf, size);         \
+       if (size != _rc)                                                \
+               tuner_err("i2c input error: rc = %d (should be %d)\n",  \
+                          _rc, (int)size);                             \
+       _rc;                                                            \
+})
+
+#define i2c_send_recv(priv, obuf, osize, ibuf, isize) ({               \
+       int _rc;                                                        \
+       _rc = tuner_i2c_xfer_send_recv(&priv->i2c_props, obuf, osize,   \
+                                      ibuf, isize);                    \
+       if (isize != _rc)                                               \
                tuner_err("i2c input error: rc = %d (should be %d)\n",  \
-                          rc, (int)size);                              \
-} while (0)
+                          _rc, (int)isize);                            \
+       _rc;                                                            \
+})
 
-#define send_seq(priv, data...)        do {                                    \
-       int rc;                                                         \
+#define send_seq(priv, data...)        ({                                      \
        static u8 _val[] = data;                                        \
+       int _rc;                                                        \
        if (sizeof(_val) !=                                             \
-                       (rc = tuner_i2c_xfer_send(&priv->i2c_props,     \
+                       (_rc = tuner_i2c_xfer_send(&priv->i2c_props,    \
                                                _val, sizeof(_val)))) { \
-               tuner_err("Error on line %d: %d\n", __LINE__, rc);      \
-               return -EINVAL;                                         \
-       }                                                               \
-       msleep(10);                                                     \
-} while (0)
+               tuner_err("Error on line %d: %d\n", __LINE__, _rc);     \
+       } else                                                          \
+               msleep(10);                                             \
+       _rc;                                                            \
+})
 
-static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg)
+static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val)
 {
-       int rc;
        unsigned char buf[2];
+       unsigned char ibuf[2];
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s %04x called\n", __FUNCTION__, reg);
 
-       buf[0] = reg>>8;
+       buf[0] = reg >> 8;
        buf[1] = (unsigned char) reg;
 
-       i2c_send(rc, priv, buf, 2);
-       if (rc < 0)
-               return rc;
-
-       i2c_rcv(rc, priv, buf, 2);
-       if (rc < 0)
-               return rc;
+       if (i2c_send_recv(priv, buf, 2, ibuf, 2) != 2)
+               return -EIO;
 
-       return (buf[1]) | (buf[0] << 8);
+       *val = (ibuf[1]) | (ibuf[0] << 8);
+       return 0;
 }
 
-void dump_firm_type(unsigned int type)
+#define dump_firm_type(t)      dump_firm_type_and_int_freq(t, 0)
+void dump_firm_type_and_int_freq(unsigned int type, u16 int_freq)
 {
         if (type & BASE)
                printk("BASE ");
@@ -192,21 +207,23 @@ void dump_firm_type(unsigned int type)
                printk("INPUT2 ");
         if (type & SCODE)
                printk("SCODE ");
+        if (type & HAS_IF)
+               printk("HAS_IF_%d ", int_freq);
 }
 
-static v4l2_std_id parse_audio_std_option(void)
+static  v4l2_std_id parse_audio_std_option(void)
 {
-       if (strcasecmp(audio_std, "A2"))
+       if (strcasecmp(audio_std, "A2") == 0)
                return V4L2_STD_A2;
-       if (strcasecmp(audio_std, "A2/A"))
+       if (strcasecmp(audio_std, "A2/A") == 0)
                return V4L2_STD_A2_A;
-       if (strcasecmp(audio_std, "A2/B"))
+       if (strcasecmp(audio_std, "A2/B") == 0)
                return V4L2_STD_A2_B;
-       if (strcasecmp(audio_std, "NICAM"))
+       if (strcasecmp(audio_std, "NICAM") == 0)
                return V4L2_STD_NICAM;
-       if (strcasecmp(audio_std, "NICAM/A"))
+       if (strcasecmp(audio_std, "NICAM/A") == 0)
                return V4L2_STD_NICAM_A;
-       if (strcasecmp(audio_std, "NICAM/B"))
+       if (strcasecmp(audio_std, "NICAM/B") == 0)
                return V4L2_STD_NICAM_B;
 
        return 0;
@@ -225,7 +242,9 @@ static void free_firmware(struct xc2028_data *priv)
        kfree(priv->firm);
 
        priv->firm = NULL;
-       priv->need_load_generic = 1;
+       priv->firm_size = 0;
+
+       memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
 }
 
 static int load_all_firmwares(struct dvb_frontend *fe)
@@ -239,8 +258,9 @@ static int load_all_firmwares(struct dvb_frontend *fe)
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
-       tuner_info("Reading firmware %s\n", priv->ctrl.fname);
-       rc = request_firmware(&fw, priv->ctrl.fname, priv->dev);
+       tuner_dbg("Reading firmware %s\n", priv->ctrl.fname);
+       rc = request_firmware(&fw, priv->ctrl.fname,
+                             &priv->i2c_props.adap->dev);
        if (rc < 0) {
                if (rc == -ENOENT)
                        tuner_err("Error: firmware %s not found.\n",
@@ -254,48 +274,44 @@ static int load_all_firmwares(struct dvb_frontend *fe)
        p = fw->data;
        endp = p + fw->size;
 
-       if (fw->size < sizeof(name) - 1 + 2) {
-               tuner_err("Error: firmware size is zero!\n");
-               rc = -EINVAL;
-               goto done;
+       if (fw->size < sizeof(name) - 1 + 2 + 2) {
+               tuner_err("Error: firmware file %s has invalid size!\n",
+                         priv->ctrl.fname);
+               goto corrupt;
        }
 
        memcpy(name, p, sizeof(name) - 1);
        name[sizeof(name) - 1] = 0;
        p += sizeof(name) - 1;
 
-       priv->version = le16_to_cpu(*(__u16 *) p);
+       priv->firm_version = le16_to_cpu(*(__u16 *) p);
        p += 2;
 
-       tuner_info("Firmware: %s, ver %d.%d\n", name,
-                  priv->version >> 8, priv->version & 0xff);
-
-       if (p + 2 > endp)
-               goto corrupt;
-
        n_array = le16_to_cpu(*(__u16 *) p);
        p += 2;
 
-       tuner_info("There are %d firmwares at %s\n",
-                  n_array, priv->ctrl.fname);
+       tuner_info("Loading %d firmware images from %s, type: %s, ver %d.%d\n",
+                  n_array, priv->ctrl.fname, name,
+                  priv->firm_version >> 8, priv->firm_version & 0xff);
 
        priv->firm = kzalloc(sizeof(*priv->firm) * n_array, GFP_KERNEL);
-
-       if (!fw) {
-               tuner_err("Not enough memory for reading firmware.\n");
+       if (priv->firm == NULL) {
+               tuner_err("Not enough memory to load firmware file.\n");
                rc = -ENOMEM;
-               goto done;
+               goto err;
        }
-
        priv->firm_size = n_array;
+
        n = -1;
        while (p < endp) {
                __u32 type, size;
                v4l2_std_id id;
+               __u16 int_freq = 0;
 
                n++;
                if (n >= n_array) {
-                       tuner_err("Too much firmwares at the file\n");
+                       tuner_err("More firmware images in file than "
+                                 "were expected!\n");
                        goto corrupt;
                }
 
@@ -311,33 +327,42 @@ static int load_all_firmwares(struct dvb_frontend *fe)
                id = le64_to_cpu(*(v4l2_std_id *) p);
                p += sizeof(id);
 
+               if (type & HAS_IF) {
+                       int_freq = le16_to_cpu(*(__u16 *) p);
+                       p += sizeof(int_freq);
+               }
+
                size = le32_to_cpu(*(__u32 *) p);
                p += sizeof(size);
 
                if ((!size) || (size + p > endp)) {
                        tuner_err("Firmware type ");
                        dump_firm_type(type);
-                       printk("(%x), id %lx is corrupted "
-                              "(size=%ld, expected %d)\n",
-                              type, (unsigned long)id, endp - p, size);
+                       printk("(%x), id %llx is corrupted "
+                              "(size=%d, expected %d)\n",
+                              type, (unsigned long long)id,
+                              (unsigned)(endp - p), size);
                        goto corrupt;
                }
 
                priv->firm[n].ptr = kzalloc(size, GFP_KERNEL);
-               if (!priv->firm[n].ptr) {
-                       tuner_err("Not enough memory.\n");
+               if (priv->firm[n].ptr == NULL) {
+                       tuner_err("Not enough memory to load firmware file.\n");
                        rc = -ENOMEM;
                        goto err;
                }
-               tuner_info("Reading firmware type ");
-               dump_firm_type(type);
-               printk("(%x), id %lx, size=%d.\n",
-                          type, (unsigned long)id, size);
+               tuner_dbg("Reading firmware type ");
+               if (debug) {
+                       dump_firm_type_and_int_freq(type, int_freq);
+                       printk("(%x), id %llx, size=%d.\n",
+                              type, (unsigned long long)id, size);
+               }
 
                memcpy(priv->firm[n].ptr, p, size);
                priv->firm[n].type = type;
                priv->firm[n].id   = id;
                priv->firm[n].size = size;
+               priv->firm[n].int_freq = int_freq;
 
                p += size;
        }
@@ -354,13 +379,13 @@ corrupt:
        tuner_err("Error: firmware file is corrupted!\n");
 
 err:
-       tuner_info("Releasing loaded firmware file.\n");
-
+       tuner_info("Releasing partially loaded firmware file.\n");
        free_firmware(priv);
 
 done:
        release_firmware(fw);
-       tuner_dbg("Firmware files loaded.\n");
+       if (rc == 0)
+               tuner_dbg("Firmware files loaded.\n");
 
        return rc;
 }
@@ -369,9 +394,14 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
                         v4l2_std_id *id)
 {
        struct xc2028_data *priv = fe->tuner_priv;
-       int                i;
+       int                 i, best_i = -1, best_nr_matches = 0;
+       unsigned int        ign_firm_type_mask = 0;
 
-       tuner_dbg("%s called\n", __FUNCTION__);
+       tuner_dbg("%s called, want type=", __FUNCTION__);
+       if (debug) {
+               dump_firm_type(type);
+               printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
+       }
 
        if (!priv->firm) {
                tuner_err("Error! firmware not loaded\n");
@@ -381,31 +411,67 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
        if (((type & ~SCODE) == 0) && (*id == 0))
                *id = V4L2_STD_PAL;
 
+       if (type & BASE)
+               type &= BASE_TYPES;
+       else if (type & SCODE) {
+               type &= SCODE_TYPES;
+               ign_firm_type_mask = HAS_IF;
+       } else if (type & DTV_TYPES)
+               type &= DTV_TYPES;
+       else if (type & STD_SPECIFIC_TYPES)
+               type &= STD_SPECIFIC_TYPES;
+
        /* Seek for exact match */
        for (i = 0; i < priv->firm_size; i++) {
-               if ((type == priv->firm[i].type) && (*id == priv->firm[i].id))
+               if ((type == (priv->firm[i].type & ~ign_firm_type_mask)) &&
+                   (*id == priv->firm[i].id))
                        goto found;
        }
 
        /* Seek for generic video standard match */
        for (i = 0; i < priv->firm_size; i++) {
-               if ((type == priv->firm[i].type) && (*id & priv->firm[i].id))
-                       goto found;
+               v4l2_std_id match_mask;
+               int nr_matches;
+
+               if (type != (priv->firm[i].type & ~ign_firm_type_mask))
+                       continue;
+
+               match_mask = *id & priv->firm[i].id;
+               if (!match_mask)
+                       continue;
+
+               if ((*id & match_mask) == *id)
+                       goto found; /* Supports all the requested standards */
+
+               nr_matches = hweight64(match_mask);
+               if (nr_matches > best_nr_matches) {
+                       best_nr_matches = nr_matches;
+                       best_i = i;
+               }
+       }
+
+       if (best_nr_matches > 0) {
+               tuner_dbg("Selecting best matching firmware (%d bits) for "
+                         "type=", best_nr_matches);
+               dump_firm_type(type);
+               printk("(%x), id %016llx:\n", type, (unsigned long long)*id);
+               i = best_i;
+               goto found;
        }
 
        /*FIXME: Would make sense to seek for type "hint" match ? */
 
-       i = -EINVAL;
+       i = -ENOENT;
        goto ret;
 
 found:
        *id = priv->firm[i].id;
 
 ret:
-       tuner_dbg("%s firmware for type=", (i < 0)? "Can't find": "Found");
+       tuner_dbg("%s firmware for type=", (i < 0) ? "Can't find" : "Found");
        if (debug) {
                dump_firm_type(type);
-               printk("(%x), id %08lx.\n", type, (unsigned long)*id);
+               printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
        }
        return i;
 }
@@ -415,7 +481,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
 {
        struct xc2028_data *priv = fe->tuner_priv;
        int                pos, rc;
-       unsigned char      *p, *endp, buf[priv->max_len];
+       unsigned char      *p, *endp, buf[priv->ctrl.max_len];
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
@@ -424,15 +490,11 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
                return pos;
 
        tuner_info("Loading firmware for type=");
-       dump_firm_type(type);
-       printk("(%x), id %08lx.\n", type, (unsigned long)*id);
+       dump_firm_type(priv->firm[pos].type);
+       printk("(%x), id %016llx.\n", priv->firm[pos].type,
+              (unsigned long long)*id);
 
        p = priv->firm[pos].ptr;
-
-       if (!p) {
-               tuner_err("Firmware pointer were freed!");
-               return -EINVAL;
-       }
        endp = p + priv->firm[pos].size;
 
        while (p < endp) {
@@ -461,6 +523,25 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
                        }
                        continue;
                }
+               if (size >= 0xff00) {
+                       switch (size) {
+                       case 0xff00:
+                               rc = priv->tuner_callback(priv->video_dev,
+                                                       XC2028_RESET_CLK, 0);
+                               if (rc < 0) {
+                                       tuner_err("Error at RESET code %d\n",
+                                                 (*p) & 0x7f);
+                                       return -EINVAL;
+                               }
+                               break;
+                       default:
+                               tuner_info("Invalid RESET code %d\n",
+                                          size & 0x7f);
+                               return -EINVAL;
+
+                       }
+                       continue;
+               }
 
                /* Checks for a sleep command */
                if (size & 0x8000) {
@@ -480,12 +561,12 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
 
                /* Sends message chunks */
                while (size > 0) {
-                       int len = (size < priv->max_len - 1) ?
-                                  size : priv->max_len - 1;
+                       int len = (size < priv->ctrl.max_len - 1) ?
+                                  size : priv->ctrl.max_len - 1;
 
                        memcpy(buf + 1, p, len);
 
-                       i2c_send(rc, priv, buf, len + 1);
+                       rc = i2c_send(priv, buf, len + 1);
                        if (rc < 0) {
                                tuner_err("%d returned from send\n", rc);
                                return -EINVAL;
@@ -499,7 +580,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
 }
 
 static int load_scode(struct dvb_frontend *fe, unsigned int type,
-                        v4l2_std_id *id, int scode)
+                        v4l2_std_id *id, __u16 int_freq, int scode)
 {
        struct xc2028_data *priv = fe->tuner_priv;
        int                pos, rc;
@@ -507,245 +588,323 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
-       pos = seek_firmware(fe, type, id);
-       if (pos < 0)
-               return pos;
+       if (!int_freq) {
+               pos = seek_firmware(fe, type, id);
+               if (pos < 0)
+                       return pos;
+       } else {
+               for (pos = 0; pos < priv->firm_size; pos++) {
+                       if ((priv->firm[pos].int_freq == int_freq) &&
+                           (priv->firm[pos].type & HAS_IF))
+                               break;
+               }
+               if (pos == priv->firm_size)
+                       return -ENOENT;
+       }
 
        p = priv->firm[pos].ptr;
 
-       if (!p) {
-               tuner_err("Firmware pointer were freed!");
-               return -EINVAL;
+       if (priv->firm[pos].type & HAS_IF) {
+               if (priv->firm[pos].size != 12 * 16 || scode >= 16)
+                       return -EINVAL;
+               p += 12 * scode;
+       } else {
+               /* 16 SCODE entries per file; each SCODE entry is 12 bytes and
+                * has a 2-byte size header in the firmware format. */
+               if (priv->firm[pos].size != 14 * 16 || scode >= 16 ||
+                   le16_to_cpu(*(__u16 *)(p + 14 * scode)) != 12)
+                       return -EINVAL;
+               p += 14 * scode + 2;
        }
 
-       if ((priv->firm[pos].size != 12 * 16) || (scode >= 16))
-               return -EINVAL;
+       tuner_info("Loading SCODE for type=");
+       dump_firm_type_and_int_freq(priv->firm[pos].type,
+                                   priv->firm[pos].int_freq);
+       printk("(%x), id %016llx.\n", priv->firm[pos].type,
+              (unsigned long long)*id);
 
-       if (priv->version < 0x0202) {
-               send_seq(priv, {0x20, 0x00, 0x00, 0x00});
-       } else {
-               send_seq(priv, {0xa0, 0x00, 0x00, 0x00});
-       }
+       if (priv->firm_version < 0x0202)
+               rc = send_seq(priv, {0x20, 0x00, 0x00, 0x00});
+       else
+               rc = send_seq(priv, {0xa0, 0x00, 0x00, 0x00});
+       if (rc < 0)
+               return -EIO;
 
-       i2c_send(rc, priv, p + 12 * scode, 12);
+       rc = i2c_send(priv, p, 12);
+       if (rc < 0)
+               return -EIO;
 
-       send_seq(priv, {0x00, 0x8c});
+       rc = send_seq(priv, {0x00, 0x8c});
+       if (rc < 0)
+               return -EIO;
 
        return 0;
 }
 
-static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
-                         v4l2_std_id std, fe_bandwidth_t bandwidth)
+static int check_firmware(struct dvb_frontend *fe, unsigned int type,
+                         v4l2_std_id std, __u16 int_freq)
 {
-       struct xc2028_data      *priv = fe->tuner_priv;
-       int                     rc, version, hwmodel;
-       v4l2_std_id             std0 = 0;
-       unsigned int            type0 = 0, type = 0;
-       int                     change_digital_bandwidth;
+       struct xc2028_data         *priv = fe->tuner_priv;
+       struct firmware_properties new_fw;
+       int                        rc = 0, is_retry = 0;
+       u16                        version, hwmodel;
+       v4l2_std_id                std0;
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
        if (!priv->firm) {
-               if (!priv->ctrl.fname)
+               if (!priv->ctrl.fname) {
+                       tuner_info("xc2028/3028 firmware name not set!\n");
                        return -EINVAL;
+               }
 
                rc = load_all_firmwares(fe);
                if (rc < 0)
                        return rc;
        }
 
-       tuner_dbg("I am in mode %u and I should switch to mode %i\n",
-                  priv->mode, new_mode);
-
-       /* first of all, determine whether we have switched the mode */
-       if (new_mode != priv->mode) {
-               priv->mode = new_mode;
-               priv->need_load_generic = 1;
-       }
-
-       change_digital_bandwidth = (priv->mode == T_DIGITAL_TV
-                                   && bandwidth != priv->bandwidth) ? 1 : 0;
-       tuner_dbg("old bandwidth %u, new bandwidth %u\n", priv->bandwidth,
-                  bandwidth);
-
-       if (priv->need_load_generic) {
-               /* Reset is needed before loading firmware */
-               rc = priv->tuner_callback(priv->video_dev,
-                                         XC2028_TUNER_RESET, 0);
-               if (rc < 0)
-                       return rc;
-
-               type0 = BASE;
-
-               if (priv->ctrl.type == XC2028_FIRM_MTS)
-                       type0 |= MTS;
-
-               if (priv->bandwidth == 8)
-                       type0 |= F8MHZ;
+       if (priv->ctrl.mts && !(type & FM))
+               type |= MTS;
 
-               /* FIXME: How to load FM and FM|INPUT1 firmwares? */
+retry:
+       new_fw.type = type;
+       new_fw.id = std;
+       new_fw.std_req = std;
+       new_fw.scode_table = SCODE | priv->ctrl.scode_table;
+       new_fw.scode_nr = 0;
+       new_fw.int_freq = int_freq;
 
-               rc = load_firmware(fe, type0, &std0);
-               if (rc < 0) {
-                       tuner_err("Error %d while loading generic firmware\n",
-                                 rc);
-                       return rc;
-               }
-
-               priv->need_load_generic = 0;
-               priv->firm_type = 0;
-               if (priv->mode == T_DIGITAL_TV)
-                       change_digital_bandwidth = 1;
+       tuner_dbg("checking firmware, user requested type=");
+       if (debug) {
+               dump_firm_type(new_fw.type);
+               printk("(%x), id %016llx, ", new_fw.type,
+                      (unsigned long long)new_fw.std_req);
+               if (!int_freq) {
+                       printk("scode_tbl ");
+                       dump_firm_type(priv->ctrl.scode_table);
+                       printk("(%x), ", priv->ctrl.scode_table);
+               } else
+                       printk("int_freq %d, ", new_fw.int_freq);
+               printk("scode_nr %d\n", new_fw.scode_nr);
        }
 
-       tuner_dbg("I should change bandwidth %u\n", change_digital_bandwidth);
-
-       if (change_digital_bandwidth) {
+       /* No need to reload base firmware if it matches */
+       if (((BASE | new_fw.type) & BASE_TYPES) ==
+           (priv->cur_fw.type & BASE_TYPES)) {
+               tuner_dbg("BASE firmware not changed.\n");
+               goto skip_base;
+       }
 
-               /*FIXME: Should allow selecting between D2620 and D2633 */
-               type |= D2620;
+       /* Updating BASE - forget about all currently loaded firmware */
+       memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
 
-               /* FIXME: When should select a DTV78 firmware?
-                */
-               switch (bandwidth) {
-               case BANDWIDTH_8_MHZ:
-                       type |= DTV8;
-                       break;
-               case BANDWIDTH_7_MHZ:
-                       type |= DTV7;
-                       break;
-               case BANDWIDTH_6_MHZ:
-                       /* FIXME: Should allow select also ATSC */
-                       type |= DTV6 | QAM;
-                       break;
+       /* Reset is needed before loading firmware */
+       rc = priv->tuner_callback(priv->video_dev,
+                                 XC2028_TUNER_RESET, 0);
+       if (rc < 0)
+               goto fail;
 
-               default:
-                       tuner_err("error: bandwidth not supported.\n");
-               };
-               priv->bandwidth = bandwidth;
+       /* BASE firmwares are all std0 */
+       std0 = 0;
+       rc = load_firmware(fe, BASE | new_fw.type, &std0);
+       if (rc < 0) {
+               tuner_err("Error %d while loading base firmware\n",
+                         rc);
+               goto fail;
        }
 
        /* Load INIT1, if needed */
        tuner_dbg("Load init1 firmware, if exists\n");
-       type0 = BASE | INIT1;
-       if (priv->ctrl.type == XC2028_FIRM_MTS)
-               type0 |= MTS;
 
-       /* FIXME: Should handle errors - if INIT1 found */
-       rc = load_firmware(fe, type0, &std0);
+       rc = load_firmware(fe, BASE | INIT1 | new_fw.type, &std0);
+       if (rc == -ENOENT)
+               rc = load_firmware(fe, (BASE | INIT1 | new_fw.type) & ~F8MHZ,
+                                  &std0);
+       if (rc < 0 && rc != -ENOENT) {
+               tuner_err("Error %d while loading init1 firmware\n",
+                         rc);
+               goto fail;
+       }
 
-       /* FIXME: Should add support for FM radio
+skip_base:
+       /*
+        * No need to reload standard specific firmware if base firmware
+        * was not reloaded and requested video standards have not changed.
         */
-
-       if (priv->ctrl.type == XC2028_FIRM_MTS)
-               type |= MTS;
-
-       if (priv->firm_type & std) {
+       if (priv->cur_fw.type == (BASE | new_fw.type) &&
+           priv->cur_fw.std_req == std) {
                tuner_dbg("Std-specific firmware already loaded.\n");
-               return 0;
+               goto skip_std_specific;
        }
 
-       /* Add audio hack to std mask */
-       std |= parse_audio_std_option();
+       /* Reloading std-specific firmware forces a SCODE update */
+       priv->cur_fw.scode_table = 0;
+
+       rc = load_firmware(fe, new_fw.type, &new_fw.id);
+       if (rc == -ENOENT)
+               rc = load_firmware(fe, new_fw.type & ~F8MHZ, &new_fw.id);
 
-       rc = load_firmware(fe, type, &std);
        if (rc < 0)
-               return rc;
+               goto fail;
+
+skip_std_specific:
+       if (priv->cur_fw.scode_table == new_fw.scode_table &&
+           priv->cur_fw.scode_nr == new_fw.scode_nr) {
+               tuner_dbg("SCODE firmware already loaded.\n");
+               goto check_device;
+       }
+
+       if (new_fw.type & FM)
+               goto check_device;
 
        /* Load SCODE firmware, if exists */
-       tuner_dbg("Trying to load scode 0\n");
-       type |= SCODE;
+       tuner_dbg("Trying to load scode %d\n", new_fw.scode_nr);
 
-       rc = load_scode(fe, type, &std, 0);
+       rc = load_scode(fe, new_fw.type | new_fw.scode_table, &new_fw.id,
+                       new_fw.int_freq, new_fw.scode_nr);
 
-       version = xc2028_get_reg(priv, 0x0004);
-       hwmodel = xc2028_get_reg(priv, 0x0008);
+check_device:
+       if (xc2028_get_reg(priv, 0x0004, &version) < 0 ||
+           xc2028_get_reg(priv, 0x0008, &hwmodel) < 0) {
+               tuner_err("Unable to read tuner registers.\n");
+               goto fail;
+       }
 
        tuner_info("Device is Xceive %d version %d.%d, "
                   "firmware version %d.%d\n",
                   hwmodel, (version & 0xf000) >> 12, (version & 0xf00) >> 8,
                   (version & 0xf0) >> 4, version & 0xf);
 
-       priv->firm_type = std;
+       /* Check firmware version against what we downloaded. */
+       if (priv->firm_version != ((version & 0xf0) << 4 | (version & 0x0f))) {
+               tuner_err("Incorrect readback of firmware version.\n");
+               goto fail;
+       }
+
+       /* Check that the tuner hardware model remains consistent over time. */
+       if (priv->hwmodel == 0 && (hwmodel == 2028 || hwmodel == 3028)) {
+               priv->hwmodel = hwmodel;
+               priv->hwvers  = version & 0xff00;
+       } else if (priv->hwmodel == 0 || priv->hwmodel != hwmodel ||
+                  priv->hwvers != (version & 0xff00)) {
+               tuner_err("Read invalid device hardware information - tuner "
+                         "hung?\n");
+               goto fail;
+       }
+
+       memcpy(&priv->cur_fw, &new_fw, sizeof(priv->cur_fw));
+
+       /*
+        * By setting BASE in cur_fw.type only after successfully loading all
+        * firmwares, we can:
+        * 1. Identify that BASE firmware with type=0 has been loaded;
+        * 2. Tell whether BASE firmware was just changed the next time through.
+        */
+       priv->cur_fw.type |= BASE;
 
        return 0;
+
+fail:
+       memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
+       if (!is_retry) {
+               msleep(50);
+               is_retry = 1;
+               tuner_dbg("Retrying firmware load\n");
+               goto retry;
+       }
+
+       if (rc == -ENOENT)
+               rc = -EINVAL;
+       return rc;
 }
 
 static int xc2028_signal(struct dvb_frontend *fe, u16 *strength)
 {
        struct xc2028_data *priv = fe->tuner_priv;
-       int                frq_lock, signal = 0;
+       u16                 frq_lock, signal = 0;
+       int                 rc;
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
        mutex_lock(&priv->lock);
 
-       *strength = 0;
-
        /* Sync Lock Indicator */
-       frq_lock = xc2028_get_reg(priv, 0x0002);
-       if (frq_lock <= 0)
+       rc = xc2028_get_reg(priv, 0x0002, &frq_lock);
+       if (rc < 0 || frq_lock == 0)
                goto ret;
 
        /* Frequency is locked. Return signal quality */
 
        /* Get SNR of the video signal */
-       signal = xc2028_get_reg(priv, 0x0040);
-
-       if (signal <= 0)
-               signal = frq_lock;
+       rc = xc2028_get_reg(priv, 0x0040, &signal);
+       if (rc < 0)
+               signal = -frq_lock;
 
 ret:
        mutex_unlock(&priv->lock);
 
        *strength = signal;
 
-       return 0;
+       return rc;
 }
 
 #define DIV 15625
 
-static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
-                              enum tuner_mode new_mode,
-                              v4l2_std_id std, fe_bandwidth_t bandwidth)
+static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
+                           enum tuner_mode new_mode,
+                           unsigned int type,
+                           v4l2_std_id std,
+                           u16 int_freq)
 {
        struct xc2028_data *priv = fe->tuner_priv;
        int                rc = -EINVAL;
-       unsigned char      buf[5];
+       unsigned char      buf[4];
        u32                div, offset = 0;
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
        mutex_lock(&priv->lock);
 
-       /* HACK: It seems that specific firmware need to be reloaded
-          when freq is changed */
-
-       priv->firm_type = 0;
-
-       /* Reset GPIO 1 */
-       rc = priv->tuner_callback(priv->video_dev, XC2028_TUNER_RESET, 0);
-       if (rc < 0)
-               goto ret;
-
-       msleep(10);
-       tuner_dbg("should set frequency %d kHz)\n", freq / 1000);
+       tuner_dbg("should set frequency %d kHz\n", freq / 1000);
 
-       if (check_firmware(fe, new_mode, std, bandwidth) < 0)
+       if (check_firmware(fe, type, std, int_freq) < 0)
                goto ret;
 
-       if (new_mode == T_DIGITAL_TV)
+       /* On some cases xc2028 can disable video output, if
+        * very weak signals are received. By sending a soft
+        * reset, this is re-enabled. So, it is better to always
+        * send a soft reset before changing channels, to be sure
+        * that xc2028 will be in a safe state.
+        * Maybe this might also be needed for DTV.
+        */
+       if (new_mode == T_ANALOG_TV) {
+               rc = send_seq(priv, {0x00, 0x00});
+       } else if (priv->cur_fw.type & ATSC) {
+               offset = 1750000;
+       } else {
                offset = 2750000;
+               /*
+                * We must adjust the offset by 500kHz in two cases in order
+                * to correctly center the IF output:
+                * 1) When the ZARLINK456 or DIBCOM52 tables were explicitly
+                *    selected and a 7MHz channel is tuned;
+                * 2) When tuning a VHF channel with DTV78 firmware.
+                */
+               if (((priv->cur_fw.type & DTV7) &&
+                    (priv->cur_fw.scode_table & (ZARLINK456 | DIBCOM52))) ||
+                   ((priv->cur_fw.type & DTV78) && freq < 470000000))
+                       offset -= 500000;
+       }
 
        div = (freq - offset + DIV / 2) / DIV;
 
        /* CMD= Set frequency */
-
-       if (priv->version < 0x0202) {
-               send_seq(priv, {0x00, 0x02, 0x00, 0x00});
-       } else {
-               send_seq(priv, {0x80, 0x02, 0x00, 0x00});
-       }
+       if (priv->firm_version < 0x0202)
+               rc = send_seq(priv, {0x00, 0x02, 0x00, 0x00});
+       else
+               rc = send_seq(priv, {0x80, 0x02, 0x00, 0x00});
+       if (rc < 0)
+               goto ret;
 
        rc = priv->tuner_callback(priv->video_dev, XC2028_RESET_CLK, 1);
        if (rc < 0)
@@ -757,18 +916,17 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
        buf[1] = 0xff & (div >> 16);
        buf[2] = 0xff & (div >> 8);
        buf[3] = 0xff & (div);
-       buf[4] = 0;
 
-       i2c_send(rc, priv, buf, sizeof(buf));
+       rc = i2c_send(priv, buf, sizeof(buf));
        if (rc < 0)
                goto ret;
        msleep(100);
 
        priv->frequency = freq;
 
-       tuner_dbg("divider= %02x %02x %02x %02x (freq=%d.%02d)\n",
-              buf[1], buf[2], buf[3], buf[4],
-              freq / 1000000, (freq % 1000000) / 10000);
+       tuner_dbg("divisor= %02x %02x %02x %02x (freq=%d.%03d)\n",
+              buf[0], buf[1], buf[2], buf[3],
+              freq / 1000000, (freq % 1000000) / 1000);
 
        rc = 0;
 
@@ -778,42 +936,140 @@ ret:
        return rc;
 }
 
-static int xc2028_set_tv_freq(struct dvb_frontend *fe,
+static int xc2028_set_analog_freq(struct dvb_frontend *fe,
                              struct analog_parameters *p)
 {
        struct xc2028_data *priv = fe->tuner_priv;
+       unsigned int       type=0;
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
-       return generic_set_tv_freq(fe, 62500l * p->frequency, T_ANALOG_TV,
-                                  p->std, BANDWIDTH_8_MHZ /* NOT USED */);
+       if (p->mode == V4L2_TUNER_RADIO) {
+               type |= FM;
+               if (priv->ctrl.input1)
+                       type |= INPUT1;
+               return generic_set_freq(fe, (625l * p->frequency) / 10,
+                               T_ANALOG_TV, type, 0, 0);
+       }
+
+       /* if std is not defined, choose one */
+       if (!p->std)
+               p->std = V4L2_STD_MN;
+
+       /* PAL/M, PAL/N, PAL/Nc and NTSC variants should use 6MHz firmware */
+       if (!(p->std & V4L2_STD_MN))
+               type |= F8MHZ;
+
+       /* Add audio hack to std mask */
+       p->std |= parse_audio_std_option();
+
+       return generic_set_freq(fe, 62500l * p->frequency,
+                               T_ANALOG_TV, type, p->std, 0);
 }
 
 static int xc2028_set_params(struct dvb_frontend *fe,
                             struct dvb_frontend_parameters *p)
 {
        struct xc2028_data *priv = fe->tuner_priv;
+       unsigned int       type=0;
+       fe_bandwidth_t     bw = BANDWIDTH_8_MHZ;
+       u16                demod = 0;
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
-       /* FIXME: Only OFDM implemented */
-       if (fe->ops.info.type != FE_OFDM) {
-               tuner_err("DTV type not implemented.\n");
+       if (priv->ctrl.d2633)
+               type |= D2633;
+       else
+               type |= D2620;
+
+       switch(fe->ops.info.type) {
+       case FE_OFDM:
+               bw = p->u.ofdm.bandwidth;
+               break;
+       case FE_QAM:
+               tuner_info("WARN: There are some reports that "
+                          "QAM 6 MHz doesn't work.\n"
+                          "If this works for you, please report by "
+                          "e-mail to: v4l-dvb-maintainer@linuxtv.org\n");
+               bw = BANDWIDTH_6_MHZ;
+               type |= QAM;
+               break;
+       case FE_ATSC:
+               bw = BANDWIDTH_6_MHZ;
+               /* The only ATSC firmware (at least on v2.7) is D2633,
+                  so overrides ctrl->d2633 */
+               type |= ATSC| D2633;
+               type &= ~D2620;
+               break;
+       /* DVB-S is not supported */
+       default:
                return -EINVAL;
        }
 
-       return generic_set_tv_freq(fe, p->frequency, T_DIGITAL_TV,
-                                  0 /* NOT USED */,
-                                  p->u.ofdm.bandwidth);
+       switch (bw) {
+       case BANDWIDTH_8_MHZ:
+               if (p->frequency < 470000000)
+                       priv->ctrl.vhfbw7 = 0;
+               else
+                       priv->ctrl.uhfbw8 = 1;
+               type |= (priv->ctrl.vhfbw7 && priv->ctrl.uhfbw8) ? DTV78 : DTV8;
+               type |= F8MHZ;
+               break;
+       case BANDWIDTH_7_MHZ:
+               if (p->frequency < 470000000)
+                       priv->ctrl.vhfbw7 = 1;
+               else
+                       priv->ctrl.uhfbw8 = 0;
+               type |= (priv->ctrl.vhfbw7 && priv->ctrl.uhfbw8) ? DTV78 : DTV7;
+               type |= F8MHZ;
+               break;
+       case BANDWIDTH_6_MHZ:
+               type |= DTV6;
+               priv->ctrl.vhfbw7 = 0;
+               priv->ctrl.uhfbw8 = 0;
+               break;
+       default:
+               tuner_err("error: bandwidth not supported.\n");
+       };
+
+       /* All S-code tables need a 200kHz shift */
+       if (priv->ctrl.demod)
+               demod = priv->ctrl.demod + 200;
+
+       return generic_set_freq(fe, p->frequency,
+                               T_DIGITAL_TV, type, 0, demod);
+}
+
+static int xc2028_sleep(struct dvb_frontend *fe)
+{
+       struct xc2028_data *priv = fe->tuner_priv;
+       int rc = 0;
+
+       tuner_dbg("%s called\n", __FUNCTION__);
 
+       mutex_lock(&priv->lock);
+
+       if (priv->firm_version < 0x0202)
+               rc = send_seq(priv, {0x00, 0x08, 0x00, 0x00});
+       else
+               rc = send_seq(priv, {0x80, 0x08, 0x00, 0x00});
+
+       priv->cur_fw.type = 0;  /* need firmware reload */
+
+       mutex_unlock(&priv->lock);
+
+       return rc;
 }
 
+
 static int xc2028_dvb_release(struct dvb_frontend *fe)
 {
        struct xc2028_data *priv = fe->tuner_priv;
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
+       mutex_lock(&xc2028_list_mutex);
+
        priv->count--;
 
        if (!priv->count) {
@@ -823,8 +1079,11 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
 
                free_firmware(priv);
                kfree(priv);
+               fe->tuner_priv = NULL;
        }
 
+       mutex_unlock(&xc2028_list_mutex);
+
        return 0;
 }
 
@@ -843,26 +1102,30 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
 {
        struct xc2028_data *priv = fe->tuner_priv;
        struct xc2028_ctrl *p    = priv_cfg;
+       int                 rc   = 0;
 
        tuner_dbg("%s called\n", __FUNCTION__);
 
-       priv->ctrl.type = p->type;
+       mutex_lock(&priv->lock);
 
-       if (p->fname) {
-               kfree(priv->ctrl.fname);
+       kfree(priv->ctrl.fname);
+       free_firmware(priv);
 
-               priv->ctrl.fname = kmalloc(strlen(p->fname) + 1, GFP_KERNEL);
-               if (!priv->ctrl.fname)
-                       return -ENOMEM;
+       memcpy(&priv->ctrl, p, sizeof(priv->ctrl));
+       priv->ctrl.fname = NULL;
 
-               free_firmware(priv);
-               strcpy(priv->ctrl.fname, p->fname);
+       if (p->fname) {
+               priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL);
+               if (priv->ctrl.fname == NULL)
+                       rc = -ENOMEM;
        }
 
-       if (p->max_len > 0)
-               priv->max_len = p->max_len;
+       if (priv->ctrl.max_len < 9)
+               priv->ctrl.max_len = 13;
 
-       return 0;
+       mutex_unlock(&priv->lock);
+
+       return rc;
 }
 
 static const struct dvb_tuner_ops xc2028_dvb_tuner_ops = {
@@ -874,61 +1137,62 @@ static const struct dvb_tuner_ops xc2028_dvb_tuner_ops = {
                 },
 
        .set_config        = xc2028_set_config,
-       .set_analog_params = xc2028_set_tv_freq,
+       .set_analog_params = xc2028_set_analog_freq,
        .release           = xc2028_dvb_release,
        .get_frequency     = xc2028_get_frequency,
        .get_rf_strength   = xc2028_signal,
        .set_params        = xc2028_set_params,
+       .sleep             = xc2028_sleep,
 
 };
 
-int xc2028_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c_adap,
-                 u8 i2c_addr, struct device *dev, void *video_dev,
-                 int (*tuner_callback) (void *dev, int command, int arg))
+struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
+                                  struct xc2028_config *cfg)
 {
        struct xc2028_data *priv;
+       void               *video_dev;
 
        if (debug)
-               printk(KERN_DEBUG PREFIX "Xcv2028/3028 init called!\n");
+               printk(KERN_DEBUG PREFIX "Xcv2028/3028 init called!\n");
 
-       if (NULL == dev)
-               return -ENODEV;
+       if (NULL == cfg || NULL == cfg->video_dev)
+               return NULL;
 
-       if (NULL == video_dev)
-               return -ENODEV;
-
-       if (!tuner_callback) {
-               printk(KERN_ERR PREFIX "No tuner callback!\n");
-               return -EINVAL;
+       if (!fe) {
+               printk(KERN_ERR PREFIX ": No frontend!\n");
+               return NULL;
        }
 
+       video_dev = cfg->video_dev;
+
+       mutex_lock(&xc2028_list_mutex);
+
        list_for_each_entry(priv, &xc2028_list, xc2028_list) {
-               if (priv->dev == dev)
-                       dev = NULL;
+               if (priv->video_dev == cfg->video_dev) {
+                       video_dev = NULL;
+                       break;
+               }
        }
 
-       if (dev) {
+       if (video_dev) {
                priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-               if (priv == NULL)
-                       return -ENOMEM;
-
-               fe->tuner_priv = priv;
+               if (priv == NULL) {
+                       mutex_unlock(&xc2028_list_mutex);
+                       return NULL;
+               }
 
-               priv->bandwidth = BANDWIDTH_6_MHZ;
-               priv->need_load_generic = 1;
-               priv->mode = T_UNINITIALIZED;
-               priv->i2c_props.addr = i2c_addr;
-               priv->i2c_props.adap = i2c_adap;
-               priv->dev = dev;
+               priv->i2c_props.addr = cfg->i2c_addr;
+               priv->i2c_props.adap = cfg->i2c_adap;
                priv->video_dev = video_dev;
-               priv->tuner_callback = tuner_callback;
-               priv->max_len = 13;
-
+               priv->tuner_callback = cfg->callback;
+               priv->ctrl.max_len = 13;
 
                mutex_init(&priv->lock);
 
                list_add_tail(&priv->xc2028_list, &xc2028_list);
        }
+
+       fe->tuner_priv = priv;
        priv->count++;
 
        memcpy(&fe->ops.tuner_ops, &xc2028_dvb_tuner_ops,
@@ -936,8 +1200,14 @@ int xc2028_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c_adap,
 
        tuner_info("type set to %s\n", "XCeive xc2028/xc3028 tuner");
 
-       return 0;
+       if (cfg->ctrl)
+               xc2028_set_config(fe, cfg->ctrl);
+
+       mutex_unlock(&xc2028_list_mutex);
+
+       return fe;
 }
+
 EXPORT_SYMBOL(xc2028_attach);
 
 MODULE_DESCRIPTION("Xceive xc2028/xc3028 tuner driver");