ARM: Orion: Get address map from plat-orion instead of via platform_data

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / ehci-orion.c

diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index a68a2a5c4b83844e2b29d09f4466eda3bcea0b97..6c6a5a3b4ea7edcaaa83916a5d1e0f8eacf48114 100644 (file)
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -172,7 +172,7 @@ static const struct hc_driver ehci_orion_hc_driver = {
 
 static void __init
 ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
-                               struct mbus_dram_target_info *dram)
+                            const struct mbus_dram_target_info *dram)
 {
        int i;
 
@@ -182,7 +182,7 @@ ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
        }
 
        for (i = 0; i < dram->num_cs; i++) {
-               struct mbus_dram_window *cs = dram->cs + i;
+               const struct mbus_dram_window *cs = dram->cs + i;
 
                wrl(USB_WINDOW_CTRL(i), ((cs->size - 1) & 0xffff0000) |
                                        (cs->mbus_attr << 8) |
@@ -194,6 +194,7 @@ ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
 static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
 {
        struct orion_ehci_data *pd = pdev->dev.platform_data;
+       const struct mbus_dram_target_info *dram;
        struct resource *res;
        struct usb_hcd *hcd;
        struct ehci_hcd *ehci;
@@ -259,8 +260,9 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
        /*
         * (Re-)program MBUS remapping windows if we are asked to.
         */
-       if (pd != NULL && pd->dram != NULL)
-               ehci_orion_conf_mbus_windows(hcd, pd->dram);
+       dram = mv_mbus_dram_info();
+       if (dram)
+               ehci_orion_conf_mbus_windows(hcd, dram);
 
        /*
         * setup Orion USB controller.