ehci-mxc: Fix host power mask bit for i.MX35

[u-boot] / drivers / usb / host / ehci-mxs.c

diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index c795f23bd7fc297a95450fc2d553b30c92d37764..5062af555932dc76e20c9867d9ff73860f47b006 100644 (file)
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -23,11 +23,10 @@
 #include <asm/io.h>
 #include <asm/arch/regs-common.h>
 #include <asm/arch/regs-base.h>
-#include <asm/arch/regs-clkctrl.h>
+#include <asm/arch/regs-clkctrl-mx28.h>
 #include <asm/arch/regs-usb.h>
 #include <asm/arch/regs-usbphy.h>
 
-#include "ehci-core.h"
 #include "ehci.h"
 
 #if    (CONFIG_EHCI_MXS_PORT != 0) && (CONFIG_EHCI_MXS_PORT != 1)
@@ -39,8 +38,8 @@
 #endif
 
 static struct ehci_mxs {
-       struct mx28_usb_regs    *usb_regs;
-       struct mx28_usbphy_regs *phy_regs;
+       struct mxs_usb_regs     *usb_regs;
+       struct mxs_usbphy_regs  *phy_regs;
 } ehci_mxs;
 
 int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port)
@@ -60,8 +59,8 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port)
                return -1;
        }
 
-       mxs_usb->usb_regs = (struct mx28_usb_regs *)usb_base;
-       mxs_usb->phy_regs = (struct mx28_usbphy_regs *)phy_base;
+       mxs_usb->usb_regs = (struct mxs_usb_regs *)usb_base;
+       mxs_usb->phy_regs = (struct mxs_usbphy_regs *)phy_base;
        return 0;
 }
 
@@ -70,15 +69,15 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port)
 #define        HW_DIGCTL_CTRL_USB0_CLKGATE     (1 << 2)
 #define        HW_DIGCTL_CTRL_USB1_CLKGATE     (1 << 16)
 
-int ehci_hcd_init(void)
+int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 {
 
        int ret;
        uint32_t usb_base, cap_base;
-       struct mx28_register *digctl_ctrl =
-               (struct mx28_register *)HW_DIGCTL_CTRL;
-       struct mx28_clkctrl_regs *clkctrl_regs =
-               (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
+       struct mxs_register_32 *digctl_ctrl =
+               (struct mxs_register_32 *)HW_DIGCTL_CTRL;
+       struct mxs_clkctrl_regs *clkctrl_regs =
+               (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
 
        ret = mxs_ehci_get_port(&ehci_mxs, CONFIG_EHCI_MXS_PORT);
        if (ret)
@@ -107,28 +106,35 @@ int ehci_hcd_init(void)
                &ehci_mxs.phy_regs->hw_usbphy_ctrl_set);
 
        usb_base = ((uint32_t)ehci_mxs.usb_regs) + 0x100;
-       hccr = (struct ehci_hccr *)usb_base;
+       *hccr = (struct ehci_hccr *)usb_base;
 
-       cap_base = ehci_readl(&hccr->cr_capbase);
-       hcor = (struct ehci_hcor *)(usb_base + HC_LENGTH(cap_base));
+       cap_base = ehci_readl(&(*hccr)->cr_capbase);
+       *hcor = (struct ehci_hcor *)(usb_base + HC_LENGTH(cap_base));
 
        return 0;
 }
 
-int ehci_hcd_stop(void)
+int ehci_hcd_stop(int index)
 {
        int ret;
-       uint32_t tmp;
-       struct mx28_register *digctl_ctrl =
-               (struct mx28_register *)HW_DIGCTL_CTRL;
-       struct mx28_clkctrl_regs *clkctrl_regs =
-               (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
+       uint32_t usb_base, cap_base, tmp;
+       struct mxs_register_32 *digctl_ctrl =
+               (struct mxs_register_32 *)HW_DIGCTL_CTRL;
+       struct mxs_clkctrl_regs *clkctrl_regs =
+               (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
+       struct ehci_hccr *hccr;
+       struct ehci_hcor *hcor;
 
        ret = mxs_ehci_get_port(&ehci_mxs, CONFIG_EHCI_MXS_PORT);
        if (ret)
                return ret;
 
        /* Stop the USB port */
+       usb_base = ((uint32_t)ehci_mxs.usb_regs) + 0x100;
+       hccr = (struct ehci_hccr *)usb_base;
+       cap_base = ehci_readl(&hccr->cr_capbase);
+       hcor = (struct ehci_hcor *)(usb_base + HC_LENGTH(cap_base));
+
        tmp = ehci_readl(&hcor->or_usbcmd);
        tmp &= ~CMD_RUN;
        ehci_writel(tmp, &hcor->or_usbcmd);