5 files changed, 263 insertions, 0 deletions

diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 861a02939a9..c0a899a040d 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -120,6 +120,14 @@ config DVB_USB_M920X
           "DTV USB MINI" (in cold state) are supported.
           Firmware required.
 
+config DVB_USB_GL861
+        tristate "Genesys Logic GL861 USB2.0 support"
+        depends on DVB_USB
+        select DVB_ZL10353
+        help
+          Say Y here to support the MSI Megasky 580 (55801) DVB-T USB2.0
+          receiver with USB ID 0db0:5581.
+
 config DVB_USB_DIGITV
         tristate "Nebula Electronics uDigiTV DVB-T USB2.0 support"
         depends on DVB_USB
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index 815e2789840..53b63c58474 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -33,6 +33,9 @@ obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o
 dvb-usb-m920x-objs = m920x.o
 obj-$(CONFIG_DVB_USB_M920X) += dvb-usb-m920x.o
 
+dvb-usb-gl861-objs = gl861.o
+obj-$(CONFIG_DVB_USB_GL861) += dvb-usb-gl861.o
+
 dvb-usb-digitv-objs = digitv.o
 obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 713ec5a82d6..0414ee354b5 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -121,6 +121,7 @@
 #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM         0xdb55
 #define USB_PID_MEDION_MD95700                          0x0932
 #define USB_PID_MSI_MEGASKY580                          0x5580
+#define USB_PID_MSI_MEGASKY55801                        0x5581
 #define USB_PID_KYE_DVB_T_COLD                          0x701e
 #define USB_PID_KYE_DVB_T_WARM                          0x701f
 #define USB_PID_PCTV_200E                               0x020e
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c
new file mode 100644
index 00000000000..c16daf11a87
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -0,0 +1,235 @@
+/* DVB USB compliant linux driver for GL861 USB2.0 devices.
+ *
+ *      This program is free software; you can redistribute it and/or modify it
+ *      under the terms of the GNU General Public License as published by the Free
+ *      Software Foundation, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "gl861.h"
+
+#include "zl10353.h"
+#include "qt1010.h"
+
+/* debug */
+int dvb_usb_gl861_debug;
+module_param_named(debug,dvb_usb_gl861_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
+
+static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr,
+                                        u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+        u16 index;
+        u16 value = addr << 8;
+        int wo = (rbuf == NULL || rlen == 0); /* write-only */
+        u8 req, type;
+
+        if (wo) {
+                req = GL861_REQ_I2C_WRITE;
+                type = GL861_WRITE;
+        } else { /* rw */
+                req = GL861_REQ_I2C_READ;
+                type = GL861_READ;
+        }
+
+        switch (wlen) {
+                case 1:
+                        index = wbuf[0];
+                        break;
+                case 2:
+                        index = wbuf[0];
+                        value = value + wbuf[1];
+                        break;
+                default:
+                        warn("wlen = %x, aborting.", wlen);
+                        return -EINVAL;
+        }
+
+        return usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), req, type,
+                                        value, index, rbuf, rlen, 2000);
+}
+
+/* I2C */
+static int gl861_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+                                                                int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int i;
+
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        if (num > 2)
+                return -EINVAL;
+
+        for (i = 0; i < num; i++) {
+                /* write/read request */
+                if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
+                        if (gl861_i2c_msg(d, msg[i].addr, msg[i].buf,
+                                msg[i].len, msg[i+1].buf, msg[i+1].len) < 0)
+                                break;
+                        i++;
+                } else
+                        if (gl861_i2c_msg(d, msg[i].addr, msg[i].buf,
+                                                msg[i].len, NULL, 0) < 0)
+                                break;
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+        return i;
+}
+
+static u32 gl861_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm gl861_i2c_algo = {
+        .master_xfer   = gl861_i2c_xfer,
+        .functionality = gl861_i2c_func,
+};
+
+/* Callbacks for DVB USB */
+static int gl861_identify_state(struct usb_device *udev,
+                                struct dvb_usb_device_properties *props,
+                                struct dvb_usb_device_description **desc,
+                                int *cold)
+{
+        *cold = 0;
+
+        return 0;
+}
+
+static struct zl10353_config gl861_zl10353_config = {
+        .demod_address = 0x1e,
+        .no_tuner = 1,
+/*
+        .parallel_ts = 1,
+*/
+};
+
+static int gl861_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        if ((adap->fe = dvb_attach(zl10353_attach, &gl861_zl10353_config,
+                                        &adap->dev->i2c_adap)) != NULL) {
+                return 0;
+        }
+
+        return -EIO;
+}
+
+static int gl861_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        adap->pll_addr = 0xc4;
+        adap->pll_desc = NULL;
+        adap->fe->ops.tuner_ops.set_params = qt1010_set_params;
+
+        return 0;
+}
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_device_properties gl861_properties;
+
+static int gl861_probe(struct usb_interface *intf,
+                                                const struct usb_device_id *id)
+{
+        struct dvb_usb_device *d;
+        struct usb_host_interface *alt;
+        int ret;
+
+        if (intf->num_altsetting < 2)
+                return -ENODEV;
+
+        if ((ret = dvb_usb_device_init(intf, &gl861_properties, THIS_MODULE,
+                                                                &d)) == 0) {
+                alt = usb_altnum_to_altsetting(intf, 0);
+
+                if (alt == NULL) {
+                        deb_rc("not alt found!\n");
+                        return -ENODEV;
+                }
+
+                ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber,
+                                                alt->desc.bAlternateSetting);
+        }
+
+        return ret;
+}
+
+static struct usb_device_id gl861_table [] = {
+                { USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY55801) },
+                {}              /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, gl861_table);
+
+static struct dvb_usb_device_properties gl861_properties = {
+        .usb_ctrl = DEVICE_SPECIFIC,
+
+        .size_of_priv     = 0,
+
+        .identify_state   = gl861_identify_state,
+        .num_adapters = 1,
+        .adapter = {{
+                .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+                .frontend_attach  = gl861_frontend_attach,
+                .tuner_attach     = gl861_tuner_attach,
+
+                .stream = {
+                        .type = USB_BULK,
+                        .count = 7,
+                        .endpoint = 0x81,
+                        .u = {
+                                .bulk = {
+                                        .buffersize = 512,
+                                }
+                        }
+                },
+        }},
+        .i2c_algo         = &gl861_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+
+        .num_device_descs = 1,
+        .devices = {
+                {   "MSI Mega Sky 55801 DVB-T USB2.0",
+                        { &gl861_table[0], NULL },
+                        { NULL },
+                },
+                { NULL },
+        }
+};
+
+static struct usb_driver gl861_driver = {
+        .name           = "gl861",
+        .probe          = gl861_probe,
+        .disconnect     = dvb_usb_device_exit,
+        .id_table       = gl861_table,
+};
+
+/* module stuff */
+static int __init gl861_module_init(void)
+{
+        int ret;
+
+        if ((ret = usb_register(&gl861_driver))) {
+                err("usb_register failed. Error number %d", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static void __exit gl861_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&gl861_driver);
+}
+
+module_init (gl861_module_init);
+module_exit (gl861_module_exit);
+
+MODULE_AUTHOR("comabug@gmail.com");
+MODULE_DESCRIPTION("Driver MSI Mega Sky 580 DVB-T USB2.0 / GL861");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/gl861.h b/drivers/media/dvb/dvb-usb/gl861.h
new file mode 100644
index 00000000000..df97fcf504a
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/gl861.h
@@ -0,0 +1,16 @@
+#ifndef _DVB_USB_GL861_H_
+#define _DVB_USB_GL861_H_
+
+#define DVB_USB_LOG_PREFIX "gl861"
+#include "dvb-usb.h"
+
+extern int dvb_usb_gl861_debug;
+#define deb_rc(args...)   dprintk(dvb_usb_gl861_debug,0x01,args)
+
+#define GL861_WRITE             0x40
+#define GL861_READ              0xc0
+
+#define GL861_REQ_I2C_WRITE     0x01
+#define GL861_REQ_I2C_READ      0x02
+
+#endif