1 files changed, 55 insertions, 3 deletions

diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c
index c0f3ce6dcb56..7af941d8e717 100644
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
@@ -17,6 +17,8 @@
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 #include <linux/slab.h>
+#include <linux/usb/ehci_pdriver.h>
+#include <linux/usb/ohci_pdriver.h>
 
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
@@ -122,6 +124,53 @@ static void __init alchemy_setup_uarts(int ctype)
 static u64 alchemy_ohci_dmamask = DMA_BIT_MASK(32);
 static u64 __maybe_unused alchemy_ehci_dmamask = DMA_BIT_MASK(32);
 
+/* Power on callback for the ehci platform driver */
+static int alchemy_ehci_power_on(struct platform_device *pdev)
+{
+        return alchemy_usb_control(ALCHEMY_USB_EHCI0, 1);
+}
+
+/* Power off/suspend callback for the ehci platform driver */
+static void alchemy_ehci_power_off(struct platform_device *pdev)
+{
+        alchemy_usb_control(ALCHEMY_USB_EHCI0, 0);
+}
+
+static struct usb_ehci_pdata alchemy_ehci_pdata = {
+        .no_io_watchdog = 1,
+        .power_on       = alchemy_ehci_power_on,
+        .power_off      = alchemy_ehci_power_off,
+        .power_suspend  = alchemy_ehci_power_off,
+};
+
+/* Power on callback for the ohci platform driver */
+static int alchemy_ohci_power_on(struct platform_device *pdev)
+{
+        int unit;
+
+        unit = (pdev->id == 1) ?
+                ALCHEMY_USB_OHCI1 : ALCHEMY_USB_OHCI0;
+
+        return alchemy_usb_control(unit, 1);
+}
+
+/* Power off/suspend callback for the ohci platform driver */
+static void alchemy_ohci_power_off(struct platform_device *pdev)
+{
+        int unit;
+
+        unit = (pdev->id == 1) ?
+                ALCHEMY_USB_OHCI1 : ALCHEMY_USB_OHCI0;
+
+        alchemy_usb_control(unit, 0);
+}
+
+static struct usb_ohci_pdata alchemy_ohci_pdata = {
+        .power_on               = alchemy_ohci_power_on,
+        .power_off              = alchemy_ohci_power_off,
+        .power_suspend          = alchemy_ohci_power_off,
+};
+
 static unsigned long alchemy_ohci_data[][2] __initdata = {
         [ALCHEMY_CPU_AU1000] = { AU1000_USB_OHCI_PHYS_ADDR, AU1000_USB_HOST_INT },
         [ALCHEMY_CPU_AU1500] = { AU1000_USB_OHCI_PHYS_ADDR, AU1500_USB_HOST_INT },
@@ -169,9 +218,10 @@ static void __init alchemy_setup_usb(int ctype)
         res[1].start = alchemy_ohci_data[ctype][1];
         res[1].end = res[1].start;
         res[1].flags = IORESOURCE_IRQ;
-        pdev->name = "au1xxx-ohci";
+        pdev->name = "ohci-platform";
         pdev->id = 0;
         pdev->dev.dma_mask = &alchemy_ohci_dmamask;
+        pdev->dev.platform_data = &alchemy_ohci_pdata;
 
         if (platform_device_register(pdev))
                 printk(KERN_INFO "Alchemy USB: cannot add OHCI0\n");
@@ -188,9 +238,10 @@ static void __init alchemy_setup_usb(int ctype)
                 res[1].start = alchemy_ehci_data[ctype][1];
                 res[1].end = res[1].start;
                 res[1].flags = IORESOURCE_IRQ;
-                pdev->name = "au1xxx-ehci";
+                pdev->name = "ehci-platform";
                 pdev->id = 0;
                 pdev->dev.dma_mask = &alchemy_ehci_dmamask;
+                pdev->dev.platform_data = &alchemy_ehci_pdata;
 
                 if (platform_device_register(pdev))
                         printk(KERN_INFO "Alchemy USB: cannot add EHCI0\n");
@@ -207,9 +258,10 @@ static void __init alchemy_setup_usb(int ctype)
                 res[1].start = AU1300_USB_INT;
                 res[1].end = res[1].start;
                 res[1].flags = IORESOURCE_IRQ;
-                pdev->name = "au1xxx-ohci";
+                pdev->name = "ohci-platform";
                 pdev->id = 1;
                 pdev->dev.dma_mask = &alchemy_ohci_dmamask;
+                pdev->dev.platform_data = &alchemy_ohci_pdata;
 
                 if (platform_device_register(pdev))
                         printk(KERN_INFO "Alchemy USB: cannot add OHCI1\n");