1 files changed, 34 insertions, 2 deletions

diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index e129981f139f..0f0eb89c8cf3 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -11,15 +11,19 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/mbus.h>
 #include <asm/arch/orion.h>
+#include <asm/arch/platform.h>
 
 #define rdl(off)        __raw_readl(hcd->regs + (off))
 #define wrl(off, val)   __raw_writel((val), hcd->regs + (off))
 
-#define USB_CAUSE               0x310
-#define USB_MASK                0x314
 #define USB_CMD                 0x140
 #define USB_MODE                0x1a8
+#define USB_CAUSE               0x310
+#define USB_MASK                0x314
+#define USB_WINDOW_CTRL(i)      (0x320 + ((i) << 4))
+#define USB_WINDOW_BASE(i)      (0x324 + ((i) << 4))
 #define USB_IPG                 0x360
 #define USB_PHY_PWR_CTRL        0x400
 #define USB_PHY_TX_CTRL         0x420
@@ -162,8 +166,30 @@ static const struct hc_driver ehci_orion_hc_driver = {
         .bus_resume = ehci_bus_resume,
 };
 
+static void __init
+ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
+                                struct mbus_dram_target_info *dram)
+{
+        int i;
+
+        for (i = 0; i < 4; i++) {
+                wrl(USB_WINDOW_CTRL(i), 0);
+                wrl(USB_WINDOW_BASE(i), 0);
+        }
+
+        for (i = 0; i < dram->num_cs; i++) {
+                struct mbus_dram_window *cs = dram->cs + i;
+
+                wrl(USB_WINDOW_CTRL(i), ((cs->size - 1) & 0xffff0000) |
+                                        (cs->mbus_attr << 8) |
+                                        (dram->mbus_dram_target_id << 4) | 1);
+                wrl(USB_WINDOW_BASE(i), cs->base);
+        }
+}
+
 static int __init ehci_orion_drv_probe(struct platform_device *pdev)
 {
+        struct orion_ehci_data *pd = pdev->dev.platform_data;
         struct resource *res;
         struct usb_hcd *hcd;
         struct ehci_hcd *ehci;
@@ -227,6 +253,12 @@ static int __init ehci_orion_drv_probe(struct platform_device *pdev)
         ehci->sbrn = 0x20;
 
         /*
+         * (Re-)program MBUS remapping windows if we are asked to.
+         */
+        if (pd != NULL && pd->dram != NULL)
+                ehci_orion_conf_mbus_windows(hcd, pd->dram);
+
+        /*
          * setup Orion USB controller
          */
         orion_usb_setup(hcd);