6 files changed, 152 insertions, 10 deletions

diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index a53db1d4e07a..eb6c06979f3b 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -269,3 +269,14 @@ config USB_TEST
           See <http://www.linux-usb.org/usbtest/> for more information,
           including sample test device firmware and "how to use it".
 
+config USB_ISIGHTFW
+        tristate "iSight firmware loading support"
+        depends on USB
+        help
+          This driver loads firmware for USB Apple iSight cameras, allowing
+          them to be driven by the USB video class driver available at
+          http://linux-uvc.berlios.de
+
+          The firmware for this driver must be extracted from the MacOS
+          driver beforehand. Tools for doing so are available at
+          http://bersace03.free.fr
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index b68e6b774f1a..aba091cb5ec0 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_USB_EMI62)		+= emi62.o
 obj-$(CONFIG_USB_FTDI_ELAN)     += ftdi-elan.o
 obj-$(CONFIG_USB_IDMOUSE)       += idmouse.o
 obj-$(CONFIG_USB_IOWARRIOR)     += iowarrior.o
+obj-$(CONFIG_USB_ISIGHTFW)      += isight_firmware.o
 obj-$(CONFIG_USB_LCD)           += usblcd.o
 obj-$(CONFIG_USB_LD)            += ldusb.o
 obj-$(CONFIG_USB_LED)           += usbled.o
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c
new file mode 100644
index 000000000000..390e04885536
--- /dev/null
+++ b/drivers/usb/misc/isight_firmware.c
@@ -0,0 +1,131 @@
+/*
+ * Driver for loading USB isight firmware
+ *
+ * Copyright (C) 2008 Matthew Garrett <mjg@redhat.com>
+ *
+ * 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.
+ *
+ * The USB isight cameras in recent Apples are roughly compatible with the USB
+ * video class specification, and can be driven by uvcvideo. However, they
+ * need firmware to be loaded beforehand. After firmware loading, the device
+ * detaches from the USB bus and reattaches with a new device ID. It can then
+ * be claimed by the uvc driver.
+ *
+ * The firmware is non-free and must be extracted by the user. Tools to do this
+ * are available at http://bersace03.free.fr/ift/
+ *
+ * The isight firmware loading was reverse engineered by Johannes Berg
+ * <johannes@sipsolutions.de>, and this driver is based on code by Ronald
+ * Bultje <rbultje@ronald.bitfreak.net>
+ */
+
+#include <linux/usb.h>
+#include <linux/firmware.h>
+#include <linux/errno.h>
+#include <linux/module.h>
+
+static struct usb_device_id id_table[] = {
+        {USB_DEVICE(0x05ac, 0x8300)},
+        {},
+};
+
+MODULE_DEVICE_TABLE(usb, id_table);
+
+static int isight_firmware_load(struct usb_interface *intf,
+                                const struct usb_device_id *id)
+{
+        struct usb_device *dev = interface_to_usbdev(intf);
+        int llen, len, req, ret = 0;
+        const struct firmware *firmware;
+        unsigned char *buf;
+        unsigned char data[4];
+        char *ptr;
+
+        if (request_firmware(&firmware, "isight.fw", &dev->dev) != 0) {
+                printk(KERN_ERR "Unable to load isight firmware\n");
+                return -ENODEV;
+        }
+
+        ptr = firmware->data;
+
+        if (usb_control_msg
+            (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, "\1", 1,
+             300) != 1) {
+                printk(KERN_ERR
+                       "Failed to initialise isight firmware loader\n");
+                ret = -ENODEV;
+                goto out;
+        }
+
+        while (1) {
+                memcpy(data, ptr, 4);
+                len = (data[0] << 8 | data[1]);
+                req = (data[2] << 8 | data[3]);
+                ptr += 4;
+
+                if (len == 0x8001)
+                        break;  /* success */
+                else if (len == 0)
+                        continue;
+
+                for (; len > 0; req += 50) {
+                        llen = len > 50 ? 50 : len;
+                        len -= llen;
+
+                        buf = kmalloc(llen, GFP_KERNEL);
+                        memcpy(buf, ptr, llen);
+
+                        ptr += llen;
+
+                        if (usb_control_msg
+                            (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, req, 0,
+                             buf, llen, 300) != llen) {
+                                printk(KERN_ERR
+                                       "Failed to load isight firmware\n");
+                                kfree(buf);
+                                ret = -ENODEV;
+                                goto out;
+                        }
+
+                        kfree(buf);
+                }
+        }
+        if (usb_control_msg
+            (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, "\0", 1,
+             300) != 1) {
+                printk(KERN_ERR "isight firmware loading completion failed\n");
+                ret = -ENODEV;
+        }
+out:
+        release_firmware(firmware);
+        return ret;
+}
+
+static void isight_firmware_disconnect(struct usb_interface *intf)
+{
+}
+
+static struct usb_driver isight_firmware_driver = {
+        .name = "isight_firmware",
+        .probe = isight_firmware_load,
+        .disconnect = isight_firmware_disconnect,
+        .id_table = id_table,
+};
+
+static int __init isight_firmware_init(void)
+{
+        return usb_register(&isight_firmware_driver);
+}
+
+static void __exit isight_firmware_exit(void)
+{
+        usb_deregister(&isight_firmware_driver);
+}
+
+module_init(isight_firmware_init);
+module_exit(isight_firmware_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c
index 24230c638b8e..4cfa25b0f44e 100644
--- a/drivers/usb/misc/phidgetkit.c
+++ b/drivers/usb/misc/phidgetkit.c
@@ -595,14 +595,14 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic
         } while(value);
         kit->dev_no = bit;
 
-        kit->dev = device_create(phidget_class, &kit->udev->dev, 0,
-                        "interfacekit%d", kit->dev_no);
+        kit->dev = device_create_drvdata(phidget_class, &kit->udev->dev,
+                                        MKDEV(0, 0), kit,
+                                        "interfacekit%d", kit->dev_no);
         if (IS_ERR(kit->dev)) {
                 rc = PTR_ERR(kit->dev);
                 kit->dev = NULL;
                 goto out;
         }
-        dev_set_drvdata(kit->dev, kit);
 
         if (usb_submit_urb(kit->irq, GFP_KERNEL)) {
                 rc = -EIO;
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c
index f0113c17cc5a..9b4696f21b22 100644
--- a/drivers/usb/misc/phidgetmotorcontrol.c
+++ b/drivers/usb/misc/phidgetmotorcontrol.c
@@ -365,16 +365,15 @@ static int motorcontrol_probe(struct usb_interface *intf, const struct usb_devic
         } while(value);
         mc->dev_no = bit;
 
-        mc->dev = device_create(phidget_class, &mc->udev->dev, 0,
-                                "motorcontrol%d", mc->dev_no);
+        mc->dev = device_create_drvdata(phidget_class, &mc->udev->dev,
+                                        MKDEV(0, 0), mc,
+                                        "motorcontrol%d", mc->dev_no);
         if (IS_ERR(mc->dev)) {
                 rc = PTR_ERR(mc->dev);
                 mc->dev = NULL;
                 goto out;
         }
 
-        dev_set_drvdata(mc->dev, mc);
-
         if (usb_submit_urb(mc->irq, GFP_KERNEL)) {
                 rc = -EIO;
                 goto out;
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c
index 7d590c09434a..1ca7ddb41d4d 100644
--- a/drivers/usb/misc/phidgetservo.c
+++ b/drivers/usb/misc/phidgetservo.c
@@ -275,14 +275,14 @@ servo_probe(struct usb_interface *interface, const struct usb_device_id *id)
         } while (value);
         dev->dev_no = bit;
 
-        dev->dev = device_create(phidget_class, &dev->udev->dev, 0,
-                                 "servo%d", dev->dev_no);
+        dev->dev = device_create_drvdata(phidget_class, &dev->udev->dev,
+                                         MKDEV(0, 0), dev,
+                                         "servo%d", dev->dev_no);
         if (IS_ERR(dev->dev)) {
                 rc = PTR_ERR(dev->dev);
                 dev->dev = NULL;
                 goto out;
         }
-        dev_set_drvdata(dev->dev, dev);
 
         servo_count = dev->type & SERVO_COUNT_QUAD ? 4 : 1;