[adm5120] minor usb driver cleanup
[openwrt/svn-archive/archive.git] / target / linux / adm5120-2.6 / files / drivers / usb / host / adm5120-hcd.c
index a0ccaefd5584e10be8ad3fba26cbad08122734da..03e401a224718913405328be22f12e97dad5892c 100644 (file)
@@ -18,6 +18,7 @@
 #include <linux/usb.h>
 #include <linux/platform_device.h>
 
+#include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
@@ -30,53 +31,66 @@ MODULE_DESCRIPTION("ADM5120 USB Host Controller Driver");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jeroen Vreeken (pe1rxq@amsat.org)");
 
+#define PFX    "adm5120-hcd: "
+
 #define ADMHCD_REG_CONTROL             0x00
+#define  ADMHCD_SW_RESET               0x00000008      /* Reset */
+#define  ADMHCD_DMAA                   0x00000004      /* DMA arbitration control */
+#define  ADMHCD_SW_INTREQ              0x00000002      /* request software int */
+#define  ADMHCD_HOST_EN                        0x00000001      /* Host enable */
 #define ADMHCD_REG_INTSTATUS           0x04
+#define  ADMHCD_INT_ACT                        0x80000000      /* Interrupt active */
+#define  ADMHCD_INT_FATAL              0x40000000      /* Fatal interrupt */
+#define  ADMHCD_INT_SW                 0x20000000      /* software interrupt */
+#define  ADMHCD_INT_TD                 0x00100000      /* TD completed */
+#define  ADMHCD_FNO                    0x00000800      /* Frame number overaflow */
+#define  ADMHCD_SO                     0x00000400      /* Scheduling overrun */
+#define  ADMHCD_INSMI                  0x00000200      /* Root hub status change */
+#define  ADMHCD_BABI                   0x00000100      /* Babble detected, host mode */
+#define  ADMHCD_RESI                   0x00000020      /* Resume detected */
+#define  ADMHCD_SOFI                   0x00000010      /* SOF transmitted/received, host mode */
 #define ADMHCD_REG_INTENABLE           0x08
+#define  ADMHCD_INT_EN                 0x80000000      /* Interrupt enable */
+#define  ADMHCD_INTMASK                        0x00000001      /* Interrupt mask */
 #define ADMHCD_REG_HOSTCONTROL         0x10
+#define  ADMHCD_DMA_EN                 0x00000004      /* USB host DMA enable */
+#define  ADMHCD_STATE_MASK             0x00000003
+#define  ADMHCD_STATE_RST              0x00000000      /* bus state reset */
+#define  ADMHCD_STATE_RES              0x00000001      /* bus state resume */
+#define  ADMHCD_STATE_OP               0x00000002      /* bus state operational */
+#define  ADMHCD_STATE_SUS              0x00000003      /* bus state suspended */
 #define ADMHCD_REG_FMINTERVAL          0x18
 #define ADMHCD_REG_FMNUMBER            0x1c
 #define ADMHCD_REG_LSTHRESH            0x70
 #define ADMHCD_REG_RHDESCR             0x74
+#define  ADMHCD_CRWE                   0x20000000      /* Clear wakeup enable */
+#define  ADMHCD_DRWE                   0x10000000      /* Device remote wakeup enable */
+#define  ADMHCD_HW_OCIC                        0x08000000      /* Over current indication change */
+#define  ADMHCD_LPSC                   0x04000000      /* Local power switch change */
+#define  ADMHCD_OCI                    0x02000000      /* Over current indication */
+#define  ADMHCD_LPS                    0x01000000      /* Local power switch/global power switch */
+#define  ADMHCD_NOCP                   0x00000800      /* No over current protect mode */
+#define  ADMHCD_OPCM                   0x00000400      /* Over current protect mode */
+#define  ADMHCD_NPS                    0x00000200      /* No Power Switch */
+#define  ADMHCD_PSM                    0x00000100      /* Power switch mode */
 #define ADMHCD_REG_PORTSTATUS0         0x78
+#define  ADMHCD_CCS                    0x00000001      /* current connect status */
+#define  ADMHCD_PES                    0x00000002      /* port enable status */
+#define  ADMHCD_PSS                    0x00000004      /* port suspend status */
+#define  ADMHCD_POCI                   0x00000008      /* port overcurrent indicator */
+#define  ADMHCD_PRS                    0x00000010      /* port reset status */
+#define  ADMHCD_PPS                    0x00000100      /* port power status */
+#define  ADMHCD_LSDA                   0x00000200      /* low speed device attached */
+#define  ADMHCD_CSC                    0x00010000      /* connect status change */
+#define  ADMHCD_PESC                   0x00020000      /* enable status change */
+#define  ADMHCD_PSSC                   0x00040000      /* suspend status change */
+#define  ADMHCD_OCIC                   0x00080000      /* overcurrent change*/
+#define  ADMHCD_PRSC                   0x00100000      /* reset status change */
 #define ADMHCD_REG_PORTSTATUS1         0x7c
 #define ADMHCD_REG_HOSTHEAD            0x80
 
-
 #define ADMHCD_NUMPORTS                2
 
-#define ADMHCD_HOST_EN         0x00000001      /* Host enable */
-#define ADMHCD_SW_INTREQ       0x00000002      /* request software int */
-#define ADMHCD_SW_RESET                0x00000008      /* Reset */
-
-#define ADMHCD_INT_TD          0x00100000      /* TD completed */
-#define ADMHCD_INT_SW          0x20000000      /* software interrupt */
-#define ADMHCD_INT_FATAL       0x40000000      /* Fatal interrupt */
-#define ADMHCD_INT_ACT         0x80000000      /* Interrupt active */
-
-#define ADMHCD_STATE_RST       0x00000000      /* bus state reset */
-#define ADMHCD_STATE_RES       0x00000001      /* bus state resume */
-#define ADMHCD_STATE_OP                0x00000002      /* bus state operational */
-#define ADMHCD_STATE_SUS       0x00000003      /* bus state suspended */
-#define ADMHCD_DMA_EN          0x00000004      /* enable dma engine */
-
-#define ADMHCD_NPS             0x00000020      /* No Power Switch */
-#define ADMHCD_LPSC            0x04000000      /* Local power switch change */
-
-#define ADMHCD_CCS             0x00000001      /* current connect status */
-#define ADMHCD_PES             0x00000002      /* port enable status */
-#define ADMHCD_PSS             0x00000004      /* port suspend status */
-#define ADMHCD_POCI            0x00000008      /* port overcurrent indicator */
-#define ADMHCD_PRS             0x00000010      /* port reset status */
-#define ADMHCD_PPS             0x00000100      /* port power status */
-#define ADMHCD_LSDA            0x00000200      /* low speed device attached */
-#define ADMHCD_CSC             0x00010000      /* connect status change */
-#define ADMHCD_PESC            0x00020000      /* enable status change */
-#define ADMHCD_PSSC            0x00040000      /* suspend status change */
-#define ADMHCD_OCIC            0x00080000      /* overcurrent change*/
-#define ADMHCD_PRSC            0x00100000      /* reset status change */
-
-
 struct admhcd_ed {
        /* Don't change first four, they used for DMA */
        u32                             control;
@@ -121,9 +135,9 @@ struct admhcd_td {
 
 static int admhcd_td_err[16] = {
        0,              /* No */
-       -EREMOTEIO,             /* CRC */
+       -EREMOTEIO,     /* CRC */
        -EREMOTEIO,     /* bit stuff */
-       -EREMOTEIO,             /* data toggle */
+       -EREMOTEIO,     /* data toggle */
        -EPIPE,         /* stall */
        -ETIMEDOUT,     /* timeout */
        -EPROTO,        /* pid err */
@@ -147,7 +161,6 @@ static int admhcd_td_err[16] = {
 struct admhcd {
        spinlock_t      lock;
 
-       void __iomem *addr_reg;
        void __iomem *data_reg;
        /* Root hub registers */
        u32 rhdesca;
@@ -189,14 +202,14 @@ static void admhcd_lock(struct admhcd *ahcd)
 {
        spin_lock_irqsave(&ahcd->lock, ahcd->flags);
        ahcd->dma_en = admhcd_reg_get(ahcd, ADMHCD_REG_HOSTCONTROL) &
-           ADMHCD_DMA_EN;
+               ADMHCD_DMA_EN;
        admhcd_reg_set(ahcd, ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP);
 }
 
 static void admhcd_unlock(struct admhcd *ahcd)
 {
        admhcd_reg_set(ahcd, ADMHCD_REG_HOSTCONTROL,
-           ADMHCD_STATE_OP | ahcd->dma_en);
+               ADMHCD_STATE_OP | ahcd->dma_en);
        spin_unlock_irqrestore(&ahcd->lock, ahcd->flags);
 }
 
@@ -204,12 +217,12 @@ static struct admhcd_td *admhcd_td_alloc(struct admhcd_ed *ed, struct urb *urb)
 {
        struct admhcd_td *tdn, *td;
 
-       tdn = kmalloc(sizeof(struct admhcd_td), GFP_ATOMIC);
+       tdn = kzalloc(sizeof(*tdn), GFP_ATOMIC);
        if (!tdn)
                return NULL;
+
        tdn->real = tdn;
        tdn = (struct admhcd_td *)KSEG1ADDR(tdn);
-       memset(tdn, 0, sizeof(struct admhcd_td));
        if (ed->cur == NULL) {
                ed->cur = tdn;
                ed->head = tdn;
@@ -251,7 +264,7 @@ static void admhcd_td_free(struct admhcd_ed *ed, struct urb *urb)
    in the DMA chain
  */
 static struct admhcd_ed *admhcd_get_ed(struct admhcd *ahcd,
-    struct usb_host_endpoint *ep, struct urb *urb)
+               struct usb_host_endpoint *ep, struct urb *urb)
 {
        struct admhcd_ed *hosthead;
        struct admhcd_ed *found = NULL, *ed = NULL;
@@ -270,10 +283,9 @@ static struct admhcd_ed *admhcd_get_ed(struct admhcd *ahcd,
                }
        }
        if (!found) {
-               found = kmalloc(sizeof(struct admhcd_ed), GFP_ATOMIC);
+               found = kzalloc(sizeof(*found), GFP_ATOMIC);
                if (!found)
                        goto out;
-               memset(found, 0, sizeof(struct admhcd_ed));
                found->real = found;
                found->ep = ep;
                found = (struct admhcd_ed *)KSEG1ADDR(found);
@@ -299,7 +311,7 @@ out:
 }
 
 static struct admhcd_td *admhcd_td_fill(u32 control, struct admhcd_td *td,
-    dma_addr_t data, int len)
+               dma_addr_t data, int len)
 {
        td->buffer = data;
        td->buflen = len;
@@ -328,7 +340,7 @@ static void admhcd_ed_start(struct admhcd *ahcd, struct admhcd_ed *ed)
        ahcd->dma_en |= ADMHCD_DMA_EN;
 }
 
-static irqreturn_t adm5120hcd_irq(struct usb_hcd *hcd)
+static irqreturn_t admhcd_irq(struct usb_hcd *hcd)
 {
        struct admhcd *ahcd = hcd_to_admhcd(hcd);
        u32 intstatus;
@@ -336,12 +348,14 @@ static irqreturn_t adm5120hcd_irq(struct usb_hcd *hcd)
        intstatus = admhcd_reg_get(ahcd, ADMHCD_REG_INTSTATUS);
        if (intstatus & ADMHCD_INT_FATAL) {
                admhcd_reg_set(ahcd, ADMHCD_REG_INTSTATUS, ADMHCD_INT_FATAL);
-               //
+               /* FIXME: handle fatal interrupts */
        }
+
        if (intstatus & ADMHCD_INT_SW) {
                admhcd_reg_set(ahcd, ADMHCD_REG_INTSTATUS, ADMHCD_INT_SW);
-               //
+               /* FIXME: handle software interrupts */
        }
+
        if (intstatus & ADMHCD_INT_TD) {
                struct admhcd_ed *ed, *head;
 
@@ -375,7 +389,7 @@ static irqreturn_t adm5120hcd_irq(struct usb_hcd *hcd)
 }
 
 static int admhcd_urb_enqueue(struct usb_hcd *hcd, struct usb_host_endpoint *ep,
-    struct urb *urb, gfp_t mem_flags)
+               struct urb *urb, gfp_t mem_flags)
 {
        struct admhcd *ahcd = hcd_to_admhcd(hcd);
        struct admhcd_ed *ed;
@@ -390,26 +404,26 @@ static int admhcd_urb_enqueue(struct usb_hcd *hcd, struct usb_host_endpoint *ep,
                return -ENOMEM;
 
        switch(usb_pipetype(pipe)) {
-               case PIPE_CONTROL:
-                       size = 2;
-               case PIPE_INTERRUPT:
-               case PIPE_BULK:
-               default:
-                       size += urb->transfer_buffer_length / 4096;
-                       if (urb->transfer_buffer_length % 4096)
-                               size++;
-                       if (size == 0)
-                               size++;
-                       else if (urb->transfer_flags & URB_ZERO_PACKET &&
-                           !(urb->transfer_buffer_length %
-                             usb_maxpacket(urb->dev, pipe, usb_pipeout(pipe)))) {
-                               size++;
-                               zero = 1;
-                       }
-                       break;
-               case PIPE_ISOCHRONOUS:
-                       size = urb->number_of_packets;
-                       break;
+       case PIPE_CONTROL:
+               size = 2;
+       case PIPE_INTERRUPT:
+       case PIPE_BULK:
+       default:
+               size += urb->transfer_buffer_length / 4096;
+               if (urb->transfer_buffer_length % 4096)
+                       size++;
+               if (size == 0)
+                       size++;
+               else if (urb->transfer_flags & URB_ZERO_PACKET &&
+                   !(urb->transfer_buffer_length %
+                     usb_maxpacket(urb->dev, pipe, usb_pipeout(pipe)))) {
+                       size++;
+                       zero = 1;
+               }
+               break;
+       case PIPE_ISOCHRONOUS:
+               size = urb->number_of_packets;
+               break;
        }
 
        admhcd_lock(ahcd);
@@ -437,52 +451,52 @@ static int admhcd_urb_enqueue(struct usb_hcd *hcd, struct usb_host_endpoint *ep,
        }
 
        switch(usb_pipetype(pipe)) {
-               case PIPE_CONTROL:
-                       td = admhcd_td_fill(ADMHCD_TD_SETUP | ADMHCD_TD_DATA0,
-                           td, (dma_addr_t)urb->setup_packet, 8);
-                       while (data_len > 0) {
-                               td = admhcd_td_fill(ADMHCD_TD_DATA1
-                                   | ADMHCD_TD_R |
-                                   (usb_pipeout(pipe) ?
-                                   ADMHCD_TD_OUT : ADMHCD_TD_IN), td,
-                                   data, data_len % 4097);
-                               data_len -= 4096;
-                       }
-                       admhcd_td_fill(ADMHCD_TD_DATA1 | (usb_pipeout(pipe) ?
-                           ADMHCD_TD_IN : ADMHCD_TD_OUT), td,
-                           data, 0);
-                       break;
-               case PIPE_INTERRUPT:
-               case PIPE_BULK:
-                       //info ok for interrupt?
-                       i = 0;
-                       while(data_len > 4096) {
-                               td = admhcd_td_fill((usb_pipeout(pipe) ?
-                                   ADMHCD_TD_OUT :
-                                   ADMHCD_TD_IN | ADMHCD_TD_R) |
-                                   (i ? ADMHCD_TD_TOGGLE : toggle), td,
-                                   data, 4096);
-                               data += 4096;
-                               data_len -= 4096;
-                               i++;
-                       }
+       case PIPE_CONTROL:
+               td = admhcd_td_fill(ADMHCD_TD_SETUP | ADMHCD_TD_DATA0,
+                   td, (dma_addr_t)urb->setup_packet, 8);
+               while (data_len > 0) {
+                       td = admhcd_td_fill(ADMHCD_TD_DATA1
+                           | ADMHCD_TD_R |
+                           (usb_pipeout(pipe) ?
+                           ADMHCD_TD_OUT : ADMHCD_TD_IN), td,
+                           data, data_len % 4097);
+                       data_len -= 4096;
+               }
+               admhcd_td_fill(ADMHCD_TD_DATA1 | (usb_pipeout(pipe) ?
+                   ADMHCD_TD_IN : ADMHCD_TD_OUT), td,
+                   data, 0);
+               break;
+       case PIPE_INTERRUPT:
+       case PIPE_BULK:
+               //info ok for interrupt?
+               i = 0;
+               while(data_len > 4096) {
                        td = admhcd_td_fill((usb_pipeout(pipe) ?
-                           ADMHCD_TD_OUT : ADMHCD_TD_IN) |
-                           (i ? ADMHCD_TD_TOGGLE : toggle), td, data, data_len);
+                           ADMHCD_TD_OUT :
+                           ADMHCD_TD_IN | ADMHCD_TD_R) |
+                           (i ? ADMHCD_TD_TOGGLE : toggle), td,
+                           data, 4096);
+                       data += 4096;
+                       data_len -= 4096;
                        i++;
-                       if (zero)
-                               admhcd_td_fill((usb_pipeout(pipe) ?
-                                   ADMHCD_TD_OUT : ADMHCD_TD_IN) |
-                                   (i ? ADMHCD_TD_TOGGLE : toggle), td, 0, 0);
-                       break;
-               case PIPE_ISOCHRONOUS:
-                       for (i = 0; i < urb->number_of_packets; i++) {
-                               td = admhcd_td_fill(ADMHCD_TD_ISO |
-                                   ((urb->start_frame + i) & 0xffff), td,
-                                   data + urb->iso_frame_desc[i].offset,
-                                   urb->iso_frame_desc[i].length);
-                       }
-                       break;
+               }
+               td = admhcd_td_fill((usb_pipeout(pipe) ?
+                   ADMHCD_TD_OUT : ADMHCD_TD_IN) |
+                   (i ? ADMHCD_TD_TOGGLE : toggle), td, data, data_len);
+               i++;
+               if (zero)
+                       admhcd_td_fill((usb_pipeout(pipe) ?
+                           ADMHCD_TD_OUT : ADMHCD_TD_IN) |
+                           (i ? ADMHCD_TD_TOGGLE : toggle), td, 0, 0);
+               break;
+       case PIPE_ISOCHRONOUS:
+               for (i = 0; i < urb->number_of_packets; i++) {
+                       td = admhcd_td_fill(ADMHCD_TD_ISO |
+                           ((urb->start_frame + i) & 0xffff), td,
+                           data + urb->iso_frame_desc[i].offset,
+                           urb->iso_frame_desc[i].length);
+               }
+               break;
        }
        urb->hcpriv = ed;
        admhcd_ed_start(ahcd, ed);
@@ -537,6 +551,7 @@ static void admhcd_endpoint_disable(struct usb_hcd *hcd, struct usb_host_endpoin
        }
        for (edt = head; edt->next != ed; edt = edt->next);
        edt->next = ed->next;
+
 out_free:
        kfree(ed->real);
 out:
@@ -577,7 +592,7 @@ static __u8 root_hub_hub_des[] = {
 };
 
 static int admhcd_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
-    u16 wIndex, char *buf, u16 wLength)
+               u16 wIndex, char *buf, u16 wLength)
 {
        struct admhcd *ahcd = hcd_to_admhcd(hcd);
        int retval = 0, len;
@@ -684,11 +699,139 @@ err:
        return retval;
 }
 
+static int admhcd_start(struct usb_hcd *hcd)
+{
+       struct admhcd *ahcd = hcd_to_admhcd(hcd);
+       unsigned long flags;
+
+       printk(KERN_DEBUG PFX "calling admhcd_start\n");
+
+       spin_lock_irqsave(&ahcd->lock, flags);
+
+       /* Initialise the HCD registers */
+       admhcd_reg_set(ahcd, ADMHCD_REG_INTENABLE, 0);
+       mdelay(10);
+
+       admhcd_reg_set(ahcd, ADMHCD_REG_CONTROL, ADMHCD_SW_RESET);
+
+       while (admhcd_reg_get(ahcd, ADMHCD_REG_CONTROL) & ADMHCD_SW_RESET) {
+               printk(KERN_WARNING PFX "waiting for reset to complete\n");
+               mdelay(1);
+       }
+
+       hcd->uses_new_polling = 1;
+
+       /* Enable USB host mode */
+       admhcd_reg_set(ahcd, ADMHCD_REG_CONTROL, ADMHCD_HOST_EN);
+
+       /* Set host specific settings */
+       admhcd_reg_set(ahcd, ADMHCD_REG_HOSTHEAD, 0x00000000);
+       admhcd_reg_set(ahcd, ADMHCD_REG_FMINTERVAL, 0x20002edf);
+       admhcd_reg_set(ahcd, ADMHCD_REG_LSTHRESH, 0x628);
+
+       /* Set interrupts */
+       admhcd_reg_set(ahcd, ADMHCD_REG_INTENABLE, ADMHCD_INT_ACT |
+               ADMHCD_INT_FATAL | ADMHCD_INT_SW | ADMHCD_INT_TD);
+       admhcd_reg_set(ahcd, ADMHCD_REG_INTSTATUS, ADMHCD_INT_ACT |
+               ADMHCD_INT_FATAL | ADMHCD_INT_SW | ADMHCD_INT_TD);
+
+       /* Power on all ports */
+       admhcd_reg_set(ahcd, ADMHCD_REG_RHDESCR, ADMHCD_NPS | ADMHCD_LPSC);
+
+       /* HCD is now operationnal */
+       admhcd_reg_set(ahcd, ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP);
+
+       hcd->state = HC_STATE_RUNNING;
+
+       spin_unlock_irqrestore(&ahcd->lock, flags);
+
+       printk(KERN_DEBUG PFX "returning 0 from admhcd_start\n");
+       return 0;
+}
+
+static int admhcd_sw_reset(struct admhcd *ahcd)
+{
+       int retries = 15;
+       unsigned long flags;
+       int ret = 0;
+
+       spin_lock_irqsave(&ahcd->lock, flags);
+
+       admhcd_reg_set(ahcd, ADMHCD_REG_INTENABLE, 0);
+       mdelay(10);
+
+       admhcd_reg_set(ahcd, ADMHCD_REG_CONTROL, ADMHCD_SW_RESET);
+
+       while (--retries) {
+               mdelay(1);
+               if (!(admhcd_reg_get(ahcd, ADMHCD_REG_CONTROL) & ADMHCD_SW_RESET))
+                       break;
+       }
+       if (!retries) {
+               printk(KERN_WARNING "%s: software reset timeout\n", hcd_name);
+               ret = -ETIME;
+       }
+       spin_unlock_irqrestore(&ahcd->lock, flags);
+       return ret;
+}
+
+static int admhcd_reset(struct usb_hcd *hcd)
+{
+       struct admhcd *ahcd = hcd_to_admhcd(hcd);
+       u32 state = 0;
+       int ret, timeout = 15; /* ms */
+       unsigned long t;
+
+       ret = admhcd_sw_reset(ahcd);
+       if (ret)
+               return ret;
+
+       t = jiffies + msecs_to_jiffies(timeout);
+       do {
+               spin_lock_irq(&ahcd->lock);
+               state = admhcd_reg_get(ahcd, ADMHCD_REG_HOSTCONTROL);
+               spin_unlock_irq(&ahcd->lock);
+               state &= ADMHCD_STATE_MASK;
+               if (state == ADMHCD_STATE_RST)
+                       break;
+               msleep(4);
+       } while (time_before_eq(jiffies, t));
+
+       if (state != ADMHCD_STATE_RST) {
+               printk(KERN_WARNING "%s: device not ready after %dms\n",
+                       hcd_name, timeout);
+               ret = -ENODEV;
+       }
+
+       return ret;
+}
+
+static void admhcd_stop(struct usb_hcd *hcd)
+{
+       struct admhcd *ahcd = hcd_to_admhcd(hcd);
+       unsigned long flags;
+       u32 val;
+
+       spin_lock_irqsave(&ahcd->lock, flags);
+       admhcd_reg_set(ahcd, ADMHCD_REG_INTENABLE, 0);
+
+       /* Set global control of power for ports */
+       val = admhcd_reg_get(ahcd, ADMHCD_REG_RHDESCR);
+       val &= (~ADMHCD_PSM | ADMHCD_LPS);
+       admhcd_reg_set(ahcd, ADMHCD_REG_RHDESCR, val);
+
+       spin_unlock_irqrestore(&ahcd->lock, flags);
+
+       /* Ask for software reset */
+       admhcd_sw_reset(ahcd);
+}
+
+
 static struct hc_driver adm5120_hc_driver = {
        .description =          hcd_name,
        .product_desc =         "ADM5120 HCD",
        .hcd_priv_size =        sizeof(struct admhcd),
-       .irq =                  adm5120hcd_irq,
+       .irq =                  admhcd_irq,
        .flags =                HCD_USB11,
        .urb_enqueue =          admhcd_urb_enqueue,
        .urb_dequeue =          admhcd_urb_dequeue,
@@ -696,111 +839,112 @@ static struct hc_driver adm5120_hc_driver = {
        .get_frame_number =     admhcd_get_frame_number,
        .hub_status_data =      admhcd_hub_status_data,
        .hub_control =          admhcd_hub_control,
+       .start  =               admhcd_start,
+       .stop   =               admhcd_stop,
+       .reset =                admhcd_reset,
 };
 
 #define resource_len(r) (((r)->end - (r)->start) + 1)
 
 static int __init adm5120hcd_probe(struct platform_device *pdev)
 {
-        struct usb_hcd *hcd;
-        struct admhcd *ahcd;
-       struct resource *addr, *data;
-       void __iomem *addr_reg;
+       struct usb_hcd *hcd;
+       struct admhcd *ahcd;
+       struct resource *data;
        void __iomem *data_reg;
 
-        int err = 0, irq;
+       int err = 0, irq;
 
-       if (pdev->num_resources < 3) {
+       if (pdev->num_resources < 2) {
+               printk(KERN_WARNING PFX "not enough resources\n");
                err = -ENODEV;
                goto out;
-        }
-
-       if (pdev->dev.dma_mask) {
-                printk(KERN_DEBUG "no we won't dma\n");
-                return -EINVAL;
-        }
+       }
 
        irq = platform_get_irq(pdev, 0);
        data = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        addr = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 
-       if (!addr || !data || irq < 0) {
-                err = -ENODEV;
-                goto out;
-        }
+       if (pdev->dev.dma_mask) {
+               printk(KERN_DEBUG PFX "no we won't dma\n");
+               return -EINVAL;
+       }
 
-       if (!request_mem_region(addr->start, 2, hcd_name)) {
-                err = -EBUSY;
-                goto out;
-        }
+       if (!data || irq < 0) {
+               printk(KERN_DEBUG PFX "either IRQ or data resource is invalid\n");
+               err = -ENODEV;
+               goto out;
+       }
 
-        addr_reg = ioremap(addr->start, resource_len(addr));
-        if (addr_reg == NULL) {
-                err = -ENOMEM;
-                goto out_mem;
-        }
-        if (!request_mem_region(data->start, 2, hcd_name)) {
-                err = -EBUSY;
-                goto out_unmap;
-        }
+       if (!request_mem_region(data->start, resource_len(data), hcd_name)) {
+               printk(KERN_DEBUG PFX "cannot request memory regions for the data resource\n");
+               err = -EBUSY;
+               goto out;
+       }
 
-        data_reg = ioremap(data->start, resource_len(data));
-        if (data_reg == NULL) {
-                err = -ENOMEM;
-                goto out_mem;
+       data_reg = ioremap(data->start, resource_len(data));
+       if (data_reg == NULL) {
+               printk(KERN_DEBUG PFX "unable to ioremap\n");
+               err = -ENOMEM;
+               goto out_mem;
         }
-       
+
        hcd = usb_create_hcd(&adm5120_hc_driver, &pdev->dev, pdev->dev.bus_id);
-        if (!hcd)
-                goto out_mem;
+       if (!hcd) {
+               printk(KERN_DEBUG PFX "unable to create the hcd\n");
+               err = -ENOMEM;
+               goto out_unmap;
+       }
+
+       hcd->rsrc_start = data->start;
+       hcd->rsrc_len = resource_len(data);
+       hcd->regs = data_reg;
 
-       hcd->rsrc_start = addr->start;
        ahcd = hcd_to_admhcd(hcd);
+       ahcd->data_reg = data_reg;
+       ahcd->base = (u32)data_reg;
 
        spin_lock_init(&ahcd->lock);
        INIT_LIST_HEAD(&ahcd->async);
 
-       ahcd->data_reg = data_reg;
-        ahcd->addr_reg = addr_reg;
-
        hcd->product_desc = "ADM5120 HCD";
 
-       /* Initialise the HCD registers */
-       admhcd_reg_set(ahcd, ADMHCD_REG_INTENABLE, 0);
-       mdelay(10);
-
-       admhcd_reg_set(ahcd, ADMHCD_REG_CONTROL, ADMHCD_SW_RESET);
-
-       while (admhcd_reg_get(ahcd, ADMHCD_REG_CONTROL) & ADMHCD_SW_RESET)
-               mdelay(1);
-
-       admhcd_reg_set(ahcd, ADMHCD_REG_CONTROL, ADMHCD_HOST_EN);
-       admhcd_reg_set(ahcd, ADMHCD_REG_HOSTHEAD, 0x00000000);
-       admhcd_reg_set(ahcd, ADMHCD_REG_FMINTERVAL, 0x20002edf);
-       admhcd_reg_set(ahcd, ADMHCD_REG_LSTHRESH, 0x628);
-       admhcd_reg_set(ahcd, ADMHCD_REG_INTENABLE,
-           ADMHCD_INT_ACT | ADMHCD_INT_FATAL | ADMHCD_INT_SW | ADMHCD_INT_TD);
-       admhcd_reg_set(ahcd, ADMHCD_REG_INTSTATUS,
-           ADMHCD_INT_ACT | ADMHCD_INT_FATAL | ADMHCD_INT_SW | ADMHCD_INT_TD);
-       admhcd_reg_set(ahcd, ADMHCD_REG_RHDESCR, ADMHCD_NPS | ADMHCD_LPSC);
-       admhcd_reg_set(ahcd, ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP);
-
        err = usb_add_hcd(hcd, irq, IRQF_DISABLED);
-       if (err)
+       if (err) {
+               printk(KERN_DEBUG PFX "unable to add hcd\n");
                goto out_dev;
+       }
 
        return 0;
 
 out_dev:
        usb_put_hcd(hcd);
 out_unmap:
-       iounmap(addr_reg);
+       iounmap(data_reg);
 out_mem:
-       release_mem_region(pdev->resource[0].start, pdev->resource[0].end - pdev->resource[0].start);
+       release_mem_region(pdev->resource[0].start, pdev->resource[0].end - pdev->resource[0].start +1);
 out:
        return err;
 }
 
+#ifdef CONFIG_PM
+static int adm5120hcd_suspend(struct platform_device *pdev,  pm_message_t state)
+{
+       pdev-dev.power.power_state = state;
+       mdelay(1);
+       return 0;
+}
+
+static int adm5120hcd_resume(struct platform_device *pdev, pm_message_t state)
+{
+       pdev->dev.power.power_state = PMSG_ON;
+       mdelay(1);
+       return 0;
+}
+#else
+#define adm5120hcd_suspend     NULL
+#define adm5120hcd_resume      NULL
+#endif
+
 static int __init_or_module adm5120hcd_remove(struct platform_device *pdev)
 {
        struct usb_hcd *hcd = platform_get_drvdata(pdev);
@@ -818,25 +962,39 @@ static int __init_or_module adm5120hcd_remove(struct platform_device *pdev)
 static struct platform_driver adm5120hcd_driver = {
        .probe =        adm5120hcd_probe,
        .remove =       adm5120hcd_remove,
+       .suspend =      adm5120hcd_suspend,
+       .remove =       adm5120hcd_resume,
        .driver =       {
-               .name   = "adm5120-hcd",
+               .name   = (char *)hcd_name,
                .owner  = THIS_MODULE,
        },
 };
 
 static int __init adm5120hcd_init(void)
 {
-       if (usb_disabled())
+       int ret;
+
+       if (usb_disabled()) {
+               printk(KERN_DEBUG PFX "USB support is disabled\n");
                return -ENODEV;
-       if (!adm5120_board.has_usb)
+       }
+
+       if (mips_machgroup != MACH_GROUP_ADM5120) {
+               printk(KERN_DEBUG PFX "unsupported machine group\n");
                return -ENODEV;
+       }
 
-       return platform_driver_register(&adm5120hcd_driver);
+       ret = platform_driver_register(&adm5120hcd_driver);
+       if (ret == 0)
+               printk(KERN_INFO PFX "registered\n");
+
+       return ret;
 }
 
 static void __exit adm5120hcd_exit(void)
 {
        platform_driver_unregister(&adm5120hcd_driver);
+       printk(KERN_INFO PFX "driver unregistered\n");
 }
 
 module_init(adm5120hcd_init);