10 files changed, 326 insertions, 178 deletions

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index e4405e088589..cbd8f5f80596 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -16,7 +16,7 @@ config USB_ARCH_HAS_OHCI
         # ARM:
         default y if SA1111
         default y if ARCH_OMAP
-        default y if ARCH_S3C2410
+        default y if ARCH_S3C24XX
         default y if PXA27x
         default y if PXA3xx
         default y if ARCH_EP93XX
@@ -44,7 +44,7 @@ config USB_ARCH_HAS_EHCI
         default y if PPC_MPC512x
         default y if ARCH_IXP4XX
         default y if ARCH_W90X900
-        default y if ARCH_AT91SAM9G45
+        default y if ARCH_AT91
         default y if ARCH_MXC
         default y if ARCH_OMAP3
         default y if ARCH_CNS3XXX
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index c14a3972953a..2633f7595116 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -137,7 +137,7 @@ choice
 
 config USB_AT91
         tristate "Atmel AT91 USB Device Port"
-        depends on ARCH_AT91 && !ARCH_AT91SAM9RL && !ARCH_AT91CAP9 && !ARCH_AT91SAM9G45
+        depends on ARCH_AT91
         help
            Many Atmel AT91 processors (such as the AT91RM2000) have a
            full speed USB Device Port with support for five configurable
@@ -150,7 +150,7 @@ config USB_AT91
 config USB_ATMEL_USBA
         tristate "Atmel USBA"
         select USB_GADGET_DUALSPEED
-        depends on AVR32 || ARCH_AT91CAP9 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
+        depends on AVR32 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
         help
           USBA is the integrated high-speed USB Device controller on
           the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
@@ -284,7 +284,7 @@ config USB_IMX
 
 config USB_S3C2410
         tristate "S3C2410 USB Device Controller"
-        depends on ARCH_S3C2410
+        depends on ARCH_S3C24XX
         help
           Samsung's S3C2410 is an ARM-4 processor with an integrated
           full speed USB 1.1 device controller.  It has 4 configurable
@@ -299,7 +299,7 @@ config USB_S3C2410_DEBUG
 
 config USB_S3C_HSUDC
         tristate "S3C2416, S3C2443 and S3C2450 USB Device Controller"
-        depends on ARCH_S3C2410
+        depends on ARCH_S3C24XX
         select USB_GADGET_DUALSPEED
         help
           Samsung's S3C2416, S3C2443 and S3C2450 is an ARM9 based SoC
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 15a8cdb2ded5..36fd2b4b49a2 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -29,6 +29,8 @@
 #include <linux/clk.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 
 #include <asm/byteorder.h>
 #include <mach/hardware.h>
@@ -40,6 +42,7 @@
 #include <mach/board.h>
 #include <mach/cpu.h>
 #include <mach/at91sam9261_matrix.h>
+#include <mach/at91_matrix.h>
 
 #include "at91_udc.h"
 
@@ -910,9 +913,9 @@ static void pullup(struct at91_udc *udc, int is_on)
                 } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
                         u32     usbpucr;
 
-                        usbpucr = at91_sys_read(AT91_MATRIX_USBPUCR);
+                        usbpucr = at91_matrix_read(AT91_MATRIX_USBPUCR);
                         usbpucr |= AT91_MATRIX_USBPUCR_PUON;
-                        at91_sys_write(AT91_MATRIX_USBPUCR, usbpucr);
+                        at91_matrix_write(AT91_MATRIX_USBPUCR, usbpucr);
                 }
         } else {
                 stop_activity(udc);
@@ -928,9 +931,9 @@ static void pullup(struct at91_udc *udc, int is_on)
                 } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
                         u32     usbpucr;
 
-                        usbpucr = at91_sys_read(AT91_MATRIX_USBPUCR);
+                        usbpucr = at91_matrix_read(AT91_MATRIX_USBPUCR);
                         usbpucr &= ~AT91_MATRIX_USBPUCR_PUON;
-                        at91_sys_write(AT91_MATRIX_USBPUCR, usbpucr);
+                        at91_matrix_write(AT91_MATRIX_USBPUCR, usbpucr);
                 }
                 clk_off(udc);
         }
@@ -1706,7 +1709,27 @@ static void at91udc_shutdown(struct platform_device *dev)
         spin_unlock_irqrestore(&udc->lock, flags);
 }
 
-static int __init at91udc_probe(struct platform_device *pdev)
+static void __devinit at91udc_of_init(struct at91_udc *udc,
+                                     struct device_node *np)
+{
+        struct at91_udc_data *board = &udc->board;
+        u32 val;
+        enum of_gpio_flags flags;
+
+        if (of_property_read_u32(np, "atmel,vbus-polled", &val) == 0)
+                board->vbus_polled = 1;
+
+        board->vbus_pin = of_get_named_gpio_flags(np, "atmel,vbus-gpio", 0,
+                                                  &flags);
+        board->vbus_active_low = (flags & OF_GPIO_ACTIVE_LOW) ? 1 : 0;
+
+        board->pullup_pin = of_get_named_gpio_flags(np, "atmel,pullup-gpio", 0,
+                                                  &flags);
+
+        board->pullup_active_low = (flags & OF_GPIO_ACTIVE_LOW) ? 1 : 0;
+}
+
+static int __devinit at91udc_probe(struct platform_device *pdev)
 {
         struct device   *dev = &pdev->dev;
         struct at91_udc *udc;
@@ -1741,7 +1764,11 @@ static int __init at91udc_probe(struct platform_device *pdev)
         /* init software state */
         udc = &controller;
         udc->gadget.dev.parent = dev;
-        udc->board = *(struct at91_udc_data *) dev->platform_data;
+        if (pdev->dev.of_node)
+                at91udc_of_init(udc, pdev->dev.of_node);
+        else
+                memcpy(&udc->board, dev->platform_data,
+                       sizeof(struct at91_udc_data));
         udc->pdev = pdev;
         udc->enabled = 0;
         spin_lock_init(&udc->lock);
@@ -1970,6 +1997,15 @@ static int at91udc_resume(struct platform_device *pdev)
 #define at91udc_resume  NULL
 #endif
 
+#if defined(CONFIG_OF)
+static const struct of_device_id at91_udc_dt_ids[] = {
+        { .compatible = "atmel,at91rm9200-udc" },
+        { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, at91_udc_dt_ids);
+#endif
+
 static struct platform_driver at91_udc_driver = {
         .remove         = __exit_p(at91udc_remove),
         .shutdown       = at91udc_shutdown,
@@ -1978,6 +2014,7 @@ static struct platform_driver at91_udc_driver = {
         .driver         = {
                 .name   = (char *) driver_name,
                 .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(at91_udc_dt_ids),
         },
 };
 
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 5e10f651ad63..9f98508966d1 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -332,12 +332,12 @@ static int vbus_is_present(struct usba_udc *udc)
 
 static void toggle_bias(int is_on)
 {
-        unsigned int uckr = at91_sys_read(AT91_CKGR_UCKR);
+        unsigned int uckr = at91_pmc_read(AT91_CKGR_UCKR);
 
         if (is_on)
-                at91_sys_write(AT91_CKGR_UCKR, uckr | AT91_PMC_BIASEN);
+                at91_pmc_write(AT91_CKGR_UCKR, uckr | AT91_PMC_BIASEN);
         else
-                at91_sys_write(AT91_CKGR_UCKR, uckr & ~(AT91_PMC_BIASEN));
+                at91_pmc_write(AT91_CKGR_UCKR, uckr & ~(AT91_PMC_BIASEN));
 }
 
 #else
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index 7cdcb63b21ff..85a5cebe96b3 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -345,7 +345,7 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req)
                 }
 
                 skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page,
-                                skb->len <= 1, req->actual);
+                                skb->len <= 1, req->actual, req->actual);
                 page = NULL;
 
                 if (req->actual < req->length) { /* Last fragment */
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index a5a3ef1f0096..19f318ababa2 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -13,6 +13,7 @@
 
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/of_platform.h>
 
 /* interface and function clocks */
 static struct clk *iclk, *fclk;
@@ -115,6 +116,8 @@ static const struct hc_driver ehci_atmel_hc_driver = {
         .clear_tt_buffer_complete       = ehci_clear_tt_buffer_complete,
 };
 
+static u64 at91_ehci_dma_mask = DMA_BIT_MASK(32);
+
 static int __devinit ehci_atmel_drv_probe(struct platform_device *pdev)
 {
         struct usb_hcd *hcd;
@@ -137,6 +140,13 @@ static int __devinit ehci_atmel_drv_probe(struct platform_device *pdev)
                 goto fail_create_hcd;
         }
 
+        /* Right now device-tree probed devices don't get dma_mask set.
+         * Since shared usb code relies on it, set it here for now.
+         * Once we have dma capability bindings this can go away.
+         */
+        if (!pdev->dev.dma_mask)
+                pdev->dev.dma_mask = &at91_ehci_dma_mask;
+
         hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
         if (!hcd) {
                 retval = -ENOMEM;
@@ -225,9 +235,21 @@ static int __devexit ehci_atmel_drv_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id atmel_ehci_dt_ids[] = {
+        { .compatible = "atmel,at91sam9g45-ehci" },
+        { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, atmel_ehci_dt_ids);
+#endif
+
 static struct platform_driver ehci_atmel_driver = {
         .probe          = ehci_atmel_drv_probe,
         .remove         = __devexit_p(ehci_atmel_drv_remove),
         .shutdown       = usb_hcd_platform_shutdown,
-        .driver.name    = "atmel-ehci",
+        .driver         = {
+                .name   = "atmel-ehci",
+                .of_match_table = of_match_ptr(atmel_ehci_dt_ids),
+        },
 };
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 77afabc77f9b..db8963f5fbce 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -14,6 +14,8 @@
 
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
 
 #include <mach/hardware.h>
 #include <asm/gpio.h>
@@ -448,10 +450,11 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
 
         /* From the GPIO notifying the over-current situation, find
          * out the corresponding port */
-        gpio = irq_to_gpio(irq);
         for (port = 0; port < ARRAY_SIZE(pdata->overcurrent_pin); port++) {
-                if (pdata->overcurrent_pin[port] == gpio)
+                if (gpio_to_irq(pdata->overcurrent_pin[port]) == irq) {
+                        gpio = pdata->overcurrent_pin[port];
                         break;
+                }
         }
 
         if (port == ARRAY_SIZE(pdata->overcurrent_pin)) {
@@ -476,13 +479,109 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
         return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id at91_ohci_dt_ids[] = {
+        { .compatible = "atmel,at91rm9200-ohci" },
+        { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, at91_ohci_dt_ids);
+
+static u64 at91_ohci_dma_mask = DMA_BIT_MASK(32);
+
+static int __devinit ohci_at91_of_init(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        int i, ret, gpio;
+        enum of_gpio_flags flags;
+        struct at91_usbh_data   *pdata;
+        u32 ports;
+
+        if (!np)
+                return 0;
+
+        /* Right now device-tree probed devices don't get dma_mask set.
+         * Since shared usb code relies on it, set it here for now.
+         * Once we have dma capability bindings this can go away.
+         */
+        if (!pdev->dev.dma_mask)
+                pdev->dev.dma_mask = &at91_ohci_dma_mask;
+
+        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
+                return -ENOMEM;
+
+        if (!of_property_read_u32(np, "num-ports", &ports))
+                pdata->ports = ports;
+
+        for (i = 0; i < 2; i++) {
+                gpio = of_get_named_gpio_flags(np, "atmel,vbus-gpio", i, &flags);
+                pdata->vbus_pin[i] = gpio;
+                if (!gpio_is_valid(gpio))
+                        continue;
+                pdata->vbus_pin_active_low[i] = flags & OF_GPIO_ACTIVE_LOW;
+                ret = gpio_request(gpio, "ohci_vbus");
+                if (ret) {
+                        dev_warn(&pdev->dev, "can't request vbus gpio %d", gpio);
+                        continue;
+                }
+                ret = gpio_direction_output(gpio, !(flags & OF_GPIO_ACTIVE_LOW) ^ 1);
+                if (ret)
+                        dev_warn(&pdev->dev, "can't put vbus gpio %d as output %d",
+                                 !(flags & OF_GPIO_ACTIVE_LOW) ^ 1, gpio);
+        }
+
+        for (i = 0; i < 2; i++) {
+                gpio = of_get_named_gpio_flags(np, "atmel,oc-gpio", i, &flags);
+                pdata->overcurrent_pin[i] = gpio;
+                if (!gpio_is_valid(gpio))
+                        continue;
+                ret = gpio_request(gpio, "ohci_overcurrent");
+                if (ret) {
+                        dev_err(&pdev->dev, "can't request overcurrent gpio %d", gpio);
+                        continue;
+                }
+
+                ret = gpio_direction_input(gpio);
+                if (ret) {
+                        dev_err(&pdev->dev, "can't configure overcurrent gpio %d as input", gpio);
+                        continue;
+                }
+
+                ret = request_irq(gpio_to_irq(gpio),
+                                  ohci_hcd_at91_overcurrent_irq,
+                                  IRQF_SHARED, "ohci_overcurrent", pdev);
+                if (ret) {
+                        gpio_free(gpio);
+                        dev_warn(& pdev->dev, "cannot get GPIO IRQ for overcurrent\n");
+                }
+        }
+
+        pdev->dev.platform_data = pdata;
+
+        return 0;
+}
+#else
+static int __devinit ohci_at91_of_init(struct platform_device *pdev)
+{
+        return 0;
+}
+#endif
+
 /*-------------------------------------------------------------------------*/
 
 static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
 {
-        struct at91_usbh_data   *pdata = pdev->dev.platform_data;
+        struct at91_usbh_data   *pdata;
         int                     i;
 
+        i = ohci_at91_of_init(pdev);
+
+        if (i)
+                return i;
+
+        pdata = pdev->dev.platform_data;
+
         if (pdata) {
                 for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
                         if (!gpio_is_valid(pdata->vbus_pin[i]))
@@ -595,5 +694,6 @@ static struct platform_driver ohci_hcd_at91_driver = {
         .driver         = {
                 .name   = "at91_ohci",
                 .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(at91_ohci_dt_ids),
         },
 };
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index cd5e382db89c..543e90e336b8 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1000,7 +1000,7 @@ MODULE_LICENSE ("GPL");
 #define SA1111_DRIVER           ohci_hcd_sa1111_driver
 #endif
 
-#if defined(CONFIG_ARCH_S3C2410) || defined(CONFIG_ARCH_S3C64XX)
+#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX)
 #include "ohci-s3c2410.c"
 #define PLATFORM_DRIVER         ohci_hcd_s3c2410_driver
 #endif
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index 4bde4f9821ba..e1004fb37bd9 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -16,29 +16,115 @@
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <mach/assabet.h>
-#include <mach/badge4.h>
 #include <asm/hardware/sa1111.h>
 
 #ifndef CONFIG_SA1111
 #error "This file is SA-1111 bus glue.  CONFIG_SA1111 must be defined."
 #endif
 
-extern int usb_disabled(void);
+#define USB_STATUS      0x0118
+#define USB_RESET       0x011c
+#define USB_IRQTEST     0x0120
+
+#define USB_RESET_FORCEIFRESET  (1 << 0)
+#define USB_RESET_FORCEHCRESET  (1 << 1)
+#define USB_RESET_CLKGENRESET   (1 << 2)
+#define USB_RESET_SIMSCALEDOWN  (1 << 3)
+#define USB_RESET_USBINTTEST    (1 << 4)
+#define USB_RESET_SLEEPSTBYEN   (1 << 5)
+#define USB_RESET_PWRSENSELOW   (1 << 6)
+#define USB_RESET_PWRCTRLLOW    (1 << 7)
+
+#define USB_STATUS_IRQHCIRMTWKUP  (1 <<  7)
+#define USB_STATUS_IRQHCIBUFFACC  (1 <<  8)
+#define USB_STATUS_NIRQHCIM       (1 <<  9)
+#define USB_STATUS_NHCIMFCLR      (1 << 10)
+#define USB_STATUS_USBPWRSENSE    (1 << 11)
 
-/*-------------------------------------------------------------------------*/
+#if 0
+static void dump_hci_status(struct usb_hcd *hcd, const char *label)
+{
+        unsigned long status = sa1111_readl(hcd->regs + USB_STATUS);
+
+        dbg("%s USB_STATUS = { %s%s%s%s%s}", label,
+             ((status & USB_STATUS_IRQHCIRMTWKUP) ? "IRQHCIRMTWKUP " : ""),
+             ((status & USB_STATUS_IRQHCIBUFFACC) ? "IRQHCIBUFFACC " : ""),
+             ((status & USB_STATUS_NIRQHCIM) ? "" : "IRQHCIM "),
+             ((status & USB_STATUS_NHCIMFCLR) ? "" : "HCIMFCLR "),
+             ((status & USB_STATUS_USBPWRSENSE) ? "USBPWRSENSE " : ""));
+}
+#endif
 
-static void sa1111_start_hc(struct sa1111_dev *dev)
+static int ohci_sa1111_reset(struct usb_hcd *hcd)
 {
-        unsigned int usb_rst = 0;
+        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+
+        ohci_hcd_init(ohci);
+        return ohci_init(ohci);
+}
 
-        printk(KERN_DEBUG "%s: starting SA-1111 OHCI USB Controller\n",
-               __FILE__);
+static int __devinit ohci_sa1111_start(struct usb_hcd *hcd)
+{
+        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+        int ret;
 
-#ifdef CONFIG_SA1100_BADGE4
-        if (machine_is_badge4()) {
-                badge4_set_5V(BADGE4_5V_USB, 1);
+        ret = ohci_run(ohci);
+        if (ret < 0) {
+                ohci_err(ohci, "can't start\n");
+                ohci_stop(hcd);
         }
+        return ret;
+}
+
+static const struct hc_driver ohci_sa1111_hc_driver = {
+        .description =          hcd_name,
+        .product_desc =         "SA-1111 OHCI",
+        .hcd_priv_size =        sizeof(struct ohci_hcd),
+
+        /*
+         * generic hardware linkage
+         */
+        .irq =                  ohci_irq,
+        .flags =                HCD_USB11 | HCD_MEMORY,
+
+        /*
+         * basic lifecycle operations
+         */
+        .reset =                ohci_sa1111_reset,
+        .start =                ohci_sa1111_start,
+        .stop =                 ohci_stop,
+        .shutdown =             ohci_shutdown,
+
+        /*
+         * managing i/o requests and associated device resources
+         */
+        .urb_enqueue =          ohci_urb_enqueue,
+        .urb_dequeue =          ohci_urb_dequeue,
+        .endpoint_disable =     ohci_endpoint_disable,
+
+        /*
+         * scheduling support
+         */
+        .get_frame_number =     ohci_get_frame,
+
+        /*
+         * root hub support
+         */
+        .hub_status_data =      ohci_hub_status_data,
+        .hub_control =          ohci_hub_control,
+#ifdef  CONFIG_PM
+        .bus_suspend =          ohci_bus_suspend,
+        .bus_resume =           ohci_bus_resume,
 #endif
+        .start_port_reset =     ohci_start_port_reset,
+};
+
+static int sa1111_start_hc(struct sa1111_dev *dev)
+{
+        unsigned int usb_rst = 0;
+        int ret;
+
+        dev_dbg(&dev->dev, "starting SA-1111 OHCI USB Controller\n");
 
         if (machine_is_xp860() ||
             machine_has_neponset() ||
@@ -51,220 +137,121 @@ static void sa1111_start_hc(struct sa1111_dev *dev)
          * host controller in reset.
          */
         sa1111_writel(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,
-                      dev->mapbase + SA1111_USB_RESET);
+                      dev->mapbase + USB_RESET);
 
         /*
          * Now, carefully enable the USB clock, and take
          * the USB host controller out of reset.
          */
-        sa1111_enable_device(dev);
-        udelay(11);
-        sa1111_writel(usb_rst, dev->mapbase + SA1111_USB_RESET);
+        ret = sa1111_enable_device(dev);
+        if (ret == 0) {
+                udelay(11);
+                sa1111_writel(usb_rst, dev->mapbase + USB_RESET);
+        }
+
+        return ret;
 }
 
 static void sa1111_stop_hc(struct sa1111_dev *dev)
 {
         unsigned int usb_rst;
-        printk(KERN_DEBUG "%s: stopping SA-1111 OHCI USB Controller\n",
-               __FILE__);
+
+        dev_dbg(&dev->dev, "stopping SA-1111 OHCI USB Controller\n");
 
         /*
          * Put the USB host controller into reset.
          */
-        usb_rst = sa1111_readl(dev->mapbase + SA1111_USB_RESET);
+        usb_rst = sa1111_readl(dev->mapbase + USB_RESET);
         sa1111_writel(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,
-                      dev->mapbase + SA1111_USB_RESET);
+                      dev->mapbase + USB_RESET);
 
         /*
          * Stop the USB clock.
          */
         sa1111_disable_device(dev);
-
-#ifdef CONFIG_SA1100_BADGE4
-        if (machine_is_badge4()) {
-                /* Disable power to the USB bus */
-                badge4_set_5V(BADGE4_5V_USB, 0);
-        }
-#endif
-}
-
-
-/*-------------------------------------------------------------------------*/
-
-#if 0
-static void dump_hci_status(struct usb_hcd *hcd, const char *label)
-{
-        unsigned long status = sa1111_readl(hcd->regs + SA1111_USB_STATUS);
-
-        dbg ("%s USB_STATUS = { %s%s%s%s%s}", label,
-             ((status & USB_STATUS_IRQHCIRMTWKUP) ? "IRQHCIRMTWKUP " : ""),
-             ((status & USB_STATUS_IRQHCIBUFFACC) ? "IRQHCIBUFFACC " : ""),
-             ((status & USB_STATUS_NIRQHCIM) ? "" : "IRQHCIM "),
-             ((status & USB_STATUS_NHCIMFCLR) ? "" : "HCIMFCLR "),
-             ((status & USB_STATUS_USBPWRSENSE) ? "USBPWRSENSE " : ""));
 }
-#endif
-
-/*-------------------------------------------------------------------------*/
-
-/* configure so an HC device and id are always provided */
-/* always called with process context; sleeping is OK */
-
 
 /**
- * usb_hcd_sa1111_probe - initialize SA-1111-based HCDs
- * Context: !in_interrupt()
+ * ohci_hcd_sa1111_probe - initialize SA-1111-based HCDs
  *
  * Allocates basic resources for this USB host controller, and
- * then invokes the start() method for the HCD associated with it
- * through the hotplug entry's driver_data.
- *
- * Store this function in the HCD's struct pci_driver as probe().
+ * then invokes the start() method for the HCD associated with it.
  */
-int usb_hcd_sa1111_probe (const struct hc_driver *driver,
-                          struct sa1111_dev *dev)
+static int ohci_hcd_sa1111_probe(struct sa1111_dev *dev)
 {
         struct usb_hcd *hcd;
-        int retval;
+        int ret;
 
-        hcd = usb_create_hcd (driver, &dev->dev, "sa1111");
+        if (usb_disabled())
+                return -ENODEV;
+
+        hcd = usb_create_hcd(&ohci_sa1111_hc_driver, &dev->dev, "sa1111");
         if (!hcd)
                 return -ENOMEM;
+
         hcd->rsrc_start = dev->res.start;
         hcd->rsrc_len = resource_size(&dev->res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 dbg("request_mem_region failed");
-                retval = -EBUSY;
+                ret = -EBUSY;
                 goto err1;
         }
+
         hcd->regs = dev->mapbase;
 
-        sa1111_start_hc(dev);
-        ohci_hcd_init(hcd_to_ohci(hcd));
+        ret = sa1111_start_hc(dev);
+        if (ret)
+                goto err2;
 
-        retval = usb_add_hcd(hcd, dev->irq[1], 0);
-        if (retval == 0)
-                return retval;
+        ret = usb_add_hcd(hcd, dev->irq[1], 0);
+        if (ret == 0)
+                return ret;
 
         sa1111_stop_hc(dev);
+ err2:
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
  err1:
         usb_put_hcd(hcd);
-        return retval;
+        return ret;
 }
 
-
-/* may be called without controller electrically present */
-/* may be called with controller, bus, and devices active */
-
 /**
- * usb_hcd_sa1111_remove - shutdown processing for SA-1111-based HCDs
+ * ohci_hcd_sa1111_remove - shutdown processing for SA-1111-based HCDs
  * @dev: USB Host Controller being removed
- * Context: !in_interrupt()
- *
- * Reverses the effect of usb_hcd_sa1111_probe(), first invoking
- * the HCD's stop() method.  It is always called from a thread
- * context, normally "rmmod", "apmd", or something similar.
  *
+ * Reverses the effect of ohci_hcd_sa1111_probe(), first invoking
+ * the HCD's stop() method.
  */
-void usb_hcd_sa1111_remove (struct usb_hcd *hcd, struct sa1111_dev *dev)
+static int ohci_hcd_sa1111_remove(struct sa1111_dev *dev)
 {
+        struct usb_hcd *hcd = sa1111_get_drvdata(dev);
+
         usb_remove_hcd(hcd);
         sa1111_stop_hc(dev);
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
         usb_put_hcd(hcd);
-}
-
-/*-------------------------------------------------------------------------*/
 
-static int __devinit
-ohci_sa1111_start (struct usb_hcd *hcd)
-{
-        struct ohci_hcd *ohci = hcd_to_ohci (hcd);
-        int             ret;
-
-        if ((ret = ohci_init(ohci)) < 0)
-                return ret;
-
-        if ((ret = ohci_run (ohci)) < 0) {
-                err ("can't start %s", hcd->self.bus_name);
-                ohci_stop (hcd);
-                return ret;
-        }
         return 0;
 }
 
-/*-------------------------------------------------------------------------*/
-
-static const struct hc_driver ohci_sa1111_hc_driver = {
-        .description =          hcd_name,
-        .product_desc =         "SA-1111 OHCI",
-        .hcd_priv_size =        sizeof(struct ohci_hcd),
-
-        /*
-         * generic hardware linkage
-         */
-        .irq =                  ohci_irq,
-        .flags =                HCD_USB11 | HCD_MEMORY,
-
-        /*
-         * basic lifecycle operations
-         */
-        .start =                ohci_sa1111_start,
-        .stop =                 ohci_stop,
-
-        /*
-         * managing i/o requests and associated device resources
-         */
-        .urb_enqueue =          ohci_urb_enqueue,
-        .urb_dequeue =          ohci_urb_dequeue,
-        .endpoint_disable =     ohci_endpoint_disable,
-
-        /*
-         * scheduling support
-         */
-        .get_frame_number =     ohci_get_frame,
-
-        /*
-         * root hub support
-         */
-        .hub_status_data =      ohci_hub_status_data,
-        .hub_control =          ohci_hub_control,
-#ifdef  CONFIG_PM
-        .bus_suspend =          ohci_bus_suspend,
-        .bus_resume =           ohci_bus_resume,
-#endif
-        .start_port_reset =     ohci_start_port_reset,
-};
-
-/*-------------------------------------------------------------------------*/
-
-static int ohci_hcd_sa1111_drv_probe(struct sa1111_dev *dev)
-{
-        int ret;
-
-        if (usb_disabled())
-                return -ENODEV;
-
-        ret = usb_hcd_sa1111_probe(&ohci_sa1111_hc_driver, dev);
-        return ret;
-}
-
-static int ohci_hcd_sa1111_drv_remove(struct sa1111_dev *dev)
+static void ohci_hcd_sa1111_shutdown(struct sa1111_dev *dev)
 {
         struct usb_hcd *hcd = sa1111_get_drvdata(dev);
 
-        usb_hcd_sa1111_remove(hcd, dev);
-        return 0;
+        if (test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) {
+                hcd->driver->shutdown(hcd);
+                sa1111_stop_hc(dev);
+        }
 }
 
 static struct sa1111_driver ohci_hcd_sa1111_driver = {
         .drv = {
                 .name   = "sa1111-ohci",
+                .owner  = THIS_MODULE,
         },
         .devid          = SA1111_DEVID_USB,
-        .probe          = ohci_hcd_sa1111_drv_probe,
-        .remove         = ohci_hcd_sa1111_drv_remove,
+        .probe          = ohci_hcd_sa1111_probe,
+        .remove         = ohci_hcd_sa1111_remove,
+        .shutdown       = ohci_hcd_sa1111_shutdown,
 };
-
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 6815701cf656..836cfa9a515f 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -903,8 +903,10 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0165, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0167, 0xff, 0xff, 0xff),
           .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff),
+          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff),
+          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1057, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1058, 0xff, 0xff, 0xff) },