1 files changed, 56 insertions, 34 deletions

diff --git a/arch/mips/ath79/dev-usb.c b/arch/mips/ath79/dev-usb.c
index 36e9570e7bc4..072bb9be2304 100644
--- a/arch/mips/ath79/dev-usb.c
+++ b/arch/mips/ath79/dev-usb.c
@@ -25,17 +25,7 @@
 #include "common.h"
 #include "dev-usb.h"
 
-static struct resource ath79_ohci_resources[] = {
-        [0] = {
-                /* .start and .end fields are filled dynamically */
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = ATH79_MISC_IRQ_OHCI,
-                .end    = ATH79_MISC_IRQ_OHCI,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
+static struct resource ath79_ohci_resources[2];
 
 static u64 ath79_ohci_dmamask = DMA_BIT_MASK(32);
 
@@ -54,17 +44,7 @@ static struct platform_device ath79_ohci_device = {
         },
 };
 
-static struct resource ath79_ehci_resources[] = {
-        [0] = {
-                /* .start and .end fields are filled dynamically */
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = ATH79_CPU_IRQ_USB,
-                .end    = ATH79_CPU_IRQ_USB,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
+static struct resource ath79_ehci_resources[2];
 
 static u64 ath79_ehci_dmamask = DMA_BIT_MASK(32);
 
@@ -90,6 +70,20 @@ static struct platform_device ath79_ehci_device = {
         },
 };
 
+static void __init ath79_usb_init_resource(struct resource res[2],
+                                           unsigned long base,
+                                           unsigned long size,
+                                           int irq)
+{
+        res[0].flags = IORESOURCE_MEM;
+        res[0].start = base;
+        res[0].end = base + size - 1;
+
+        res[1].flags = IORESOURCE_IRQ;
+        res[1].start = irq;
+        res[1].end = irq;
+}
+
 #define AR71XX_USB_RESET_MASK   (AR71XX_RESET_USB_HOST | \
                                  AR71XX_RESET_USB_PHY | \
                                  AR71XX_RESET_USB_OHCI_DLL)
@@ -114,12 +108,12 @@ static void __init ath79_usb_setup(void)
 
         mdelay(900);
 
-        ath79_ohci_resources[0].start = AR71XX_OHCI_BASE;
-        ath79_ohci_resources[0].end = AR71XX_OHCI_BASE + AR71XX_OHCI_SIZE - 1;
+        ath79_usb_init_resource(ath79_ohci_resources, AR71XX_OHCI_BASE,
+                                AR71XX_OHCI_SIZE, ATH79_MISC_IRQ_OHCI);
         platform_device_register(&ath79_ohci_device);
 
-        ath79_ehci_resources[0].start = AR71XX_EHCI_BASE;
-        ath79_ehci_resources[0].end = AR71XX_EHCI_BASE + AR71XX_EHCI_SIZE - 1;
+        ath79_usb_init_resource(ath79_ehci_resources, AR71XX_EHCI_BASE,
+                                AR71XX_EHCI_SIZE, ATH79_CPU_IRQ_USB);
         ath79_ehci_device.dev.platform_data = &ath79_ehci_pdata_v1;
         platform_device_register(&ath79_ehci_device);
 }
@@ -143,8 +137,8 @@ static void __init ar7240_usb_setup(void)
 
         iounmap(usb_ctrl_base);
 
-        ath79_ohci_resources[0].start = AR7240_OHCI_BASE;
-        ath79_ohci_resources[0].end = AR7240_OHCI_BASE + AR7240_OHCI_SIZE - 1;
+        ath79_usb_init_resource(ath79_ohci_resources, AR7240_OHCI_BASE,
+                                AR7240_OHCI_SIZE, ATH79_CPU_IRQ_USB);
         platform_device_register(&ath79_ohci_device);
 }
 
@@ -159,8 +153,8 @@ static void __init ar724x_usb_setup(void)
         ath79_device_reset_clear(AR724X_RESET_USB_PHY);
         mdelay(10);
 
-        ath79_ehci_resources[0].start = AR724X_EHCI_BASE;
-        ath79_ehci_resources[0].end = AR724X_EHCI_BASE + AR724X_EHCI_SIZE - 1;
+        ath79_usb_init_resource(ath79_ehci_resources, AR724X_EHCI_BASE,
+                                AR724X_EHCI_SIZE, ATH79_CPU_IRQ_USB);
         ath79_ehci_device.dev.platform_data = &ath79_ehci_pdata_v2;
         platform_device_register(&ath79_ehci_device);
 }
@@ -176,8 +170,8 @@ static void __init ar913x_usb_setup(void)
         ath79_device_reset_clear(AR913X_RESET_USB_PHY);
         mdelay(10);
 
-        ath79_ehci_resources[0].start = AR913X_EHCI_BASE;
-        ath79_ehci_resources[0].end = AR913X_EHCI_BASE + AR913X_EHCI_SIZE - 1;
+        ath79_usb_init_resource(ath79_ehci_resources, AR913X_EHCI_BASE,
+                                AR913X_EHCI_SIZE, ATH79_CPU_IRQ_USB);
         ath79_ehci_device.dev.platform_data = &ath79_ehci_pdata_v2;
         platform_device_register(&ath79_ehci_device);
 }
@@ -193,8 +187,34 @@ static void __init ar933x_usb_setup(void)
         ath79_device_reset_clear(AR933X_RESET_USB_PHY);
         mdelay(10);
 
-        ath79_ehci_resources[0].start = AR933X_EHCI_BASE;
-        ath79_ehci_resources[0].end = AR933X_EHCI_BASE + AR933X_EHCI_SIZE - 1;
+        ath79_usb_init_resource(ath79_ehci_resources, AR933X_EHCI_BASE,
+                                AR933X_EHCI_SIZE, ATH79_CPU_IRQ_USB);
+        ath79_ehci_device.dev.platform_data = &ath79_ehci_pdata_v2;
+        platform_device_register(&ath79_ehci_device);
+}
+
+static void __init ar934x_usb_setup(void)
+{
+        u32 bootstrap;
+
+        bootstrap = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP);
+        if (bootstrap & AR934X_BOOTSTRAP_USB_MODE_DEVICE)
+                return;
+
+        ath79_device_reset_set(AR934X_RESET_USBSUS_OVERRIDE);
+        udelay(1000);
+
+        ath79_device_reset_clear(AR934X_RESET_USB_PHY);
+        udelay(1000);
+
+        ath79_device_reset_clear(AR934X_RESET_USB_PHY_ANALOG);
+        udelay(1000);
+
+        ath79_device_reset_clear(AR934X_RESET_USB_HOST);
+        udelay(1000);
+
+        ath79_usb_init_resource(ath79_ehci_resources, AR934X_EHCI_BASE,
+                                AR934X_EHCI_SIZE, ATH79_CPU_IRQ_USB);
         ath79_ehci_device.dev.platform_data = &ath79_ehci_pdata_v2;
         platform_device_register(&ath79_ehci_device);
 }
@@ -211,6 +231,8 @@ void __init ath79_register_usb(void)
                 ar913x_usb_setup();
         else if (soc_is_ar933x())
                 ar933x_usb_setup();
+        else if (soc_is_ar934x())
+                ar934x_usb_setup();
         else
                 BUG();
 }