net: pch_gbe: Convert to use DM PCI API

[oweals/u-boot.git] / drivers / usb / host / ehci-mx6.c

diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 1f5b0560db55c5dc081ce236fb58989e69a36ece..e1c67f77d72d2cd96319e13992f647dfaee73435 100644 (file)
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <usb.h>
 #include <errno.h>
+#include <wait_bit.h>
 #include <linux/compiler.h>
 #include <usb/ehci-fsl.h>
 #include <asm/io.h>
@@ -45,7 +46,10 @@
 #define ANADIG_USB2_PLL_480_CTRL_POWER         0x00001000
 #define ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS   0x00000040
 
-
+#define USBNC_OFFSET           0x200
+#define USBNC_PHYSTATUS_ID_DIG (1 << 4) /* otg_id status */
+#define USBNC_PHYCFG2_ACAENB   (1 << 4) /* otg_id detection enable */
+#define UCTRL_PM                (1 << 9) /* OTG Power Mask */
 #define UCTRL_OVER_CUR_POL     (1 << 8) /* OTG Polarity of Overcurrent */
 #define UCTRL_OVER_CUR_DIS     (1 << 7) /* Disable OTG Overcurrent Detection */
 
@@ -53,6 +57,7 @@
 #define UCMD_RUN_STOP           (1 << 0) /* controller run/stop */
 #define UCMD_RESET             (1 << 1) /* controller reset */
 
+#if defined(CONFIG_MX6)
 static const unsigned phy_bases[] = {
        USB_PHY0_BASE_ADDR,
        USB_PHY1_BASE_ADDR,
@@ -119,6 +124,7 @@ static int usb_phy_enable(int index, struct usb_ehci *ehci)
        void __iomem *phy_reg;
        void __iomem *phy_ctrl;
        void __iomem *usb_cmd;
+       int ret;
 
        if (index >= ARRAY_SIZE(phy_bases))
                return 0;
@@ -129,12 +135,15 @@ static int usb_phy_enable(int index, struct usb_ehci *ehci)
 
        /* Stop then Reset */
        clrbits_le32(usb_cmd, UCMD_RUN_STOP);
-       while (readl(usb_cmd) & UCMD_RUN_STOP)
-               ;
+       ret = wait_for_bit(__func__, usb_cmd, UCMD_RUN_STOP, false, 10000,
+                          false);
+       if (ret)
+               return ret;
 
        setbits_le32(usb_cmd, UCMD_RESET);
-       while (readl(usb_cmd) & UCMD_RESET)
-               ;
+       ret = wait_for_bit(__func__, usb_cmd, UCMD_RESET, false, 10000, false);
+       if (ret)
+               return ret;
 
        /* Reset USBPHY module */
        setbits_le32(phy_ctrl, USBPHY_CTRL_SFTRST);
@@ -153,6 +162,23 @@ static int usb_phy_enable(int index, struct usb_ehci *ehci)
        return 0;
 }
 
+int usb_phy_mode(int port)
+{
+       void __iomem *phy_reg;
+       void __iomem *phy_ctrl;
+       u32 val;
+
+       phy_reg = (void __iomem *)phy_bases[port];
+       phy_ctrl = (void __iomem *)(phy_reg + USBPHY_CTRL);
+
+       val = readl(phy_ctrl);
+
+       if (val & USBPHY_CTRL_OTG_ID)
+               return USB_INIT_DEVICE;
+       else
+               return USB_INIT_HOST;
+}
+
 /* Base address for this IP block is 0x02184800 */
 struct usbnc_regs {
        u32     ctrl[4];        /* otg/host1-3 */
@@ -161,12 +187,57 @@ struct usbnc_regs {
        u32     otg_phy_ctrl_0;
        u32     uh1_phy_ctrl_0;
 };
+#elif defined(CONFIG_MX7)
+struct usbnc_regs {
+       u32 ctrl1;
+       u32 ctrl2;
+       u32 reserve1[10];
+       u32 phy_cfg1;
+       u32 phy_cfg2;
+       u32 phy_status;
+       u32 reserve2[4];
+       u32 adp_cfg1;
+       u32 adp_cfg2;
+       u32 adp_status;
+};
+
+static void usb_power_config(int index)
+{
+       struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
+                       (0x10000 * index) + USBNC_OFFSET);
+       void __iomem *phy_cfg2 = (void __iomem *)(&usbnc->phy_cfg2);
+
+       /* Enable usb_otg_id detection */
+       setbits_le32(phy_cfg2, USBNC_PHYCFG2_ACAENB);
+}
+
+int usb_phy_mode(int port)
+{
+       struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
+                       (0x10000 * port) + USBNC_OFFSET);
+       void __iomem *status = (void __iomem *)(&usbnc->phy_status);
+       u32 val;
+
+       val = readl(status);
+
+       if (val & USBNC_PHYSTATUS_ID_DIG)
+               return USB_INIT_DEVICE;
+       else
+               return USB_INIT_HOST;
+}
+#endif
 
 static void usb_oc_config(int index)
 {
+#if defined(CONFIG_MX6)
        struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
                        USB_OTHERREGS_OFFSET);
        void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]);
+#elif defined(CONFIG_MX7)
+       struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +
+                       (0x10000 * index) + USBNC_OFFSET);
+       void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl1);
+#endif
 
 #if CONFIG_MACH_TYPE == MACH_TYPE_MX6Q_ARM2
        /* mx6qarm2 seems to required a different setting*/
@@ -175,24 +246,11 @@ static void usb_oc_config(int index)
        setbits_le32(ctrl, UCTRL_OVER_CUR_POL);
 #endif
 
+#if defined(CONFIG_MX6)
        setbits_le32(ctrl, UCTRL_OVER_CUR_DIS);
-}
-
-int usb_phy_mode(int port)
-{
-       void __iomem *phy_reg;
-       void __iomem *phy_ctrl;
-       u32 val;
-
-       phy_reg = (void __iomem *)phy_bases[port];
-       phy_ctrl = (void __iomem *)(phy_reg + USBPHY_CTRL);
-
-       val = readl(phy_ctrl);
-
-       if (val & USBPHY_CTRL_OTG_ID)
-               return USB_INIT_DEVICE;
-       else
-               return USB_INIT_HOST;
+#elif defined(CONFIG_MX7)
+       setbits_le32(ctrl, UCTRL_OVER_CUR_DIS | UCTRL_PM);
+#endif
 }
 
 /**
@@ -245,8 +303,13 @@ int ehci_hcd_init(int index, enum usb_init_type init,
                struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 {
        enum usb_init_type type;
+#if defined(CONFIG_MX6)
+       u32 controller_spacing = 0x200;
+#elif defined(CONFIG_MX7)
+       u32 controller_spacing = 0x10000;
+#endif
        struct usb_ehci *ehci = (struct usb_ehci *)(USB_BASE_ADDR +
-               (0x200 * index));
+               (controller_spacing * index));
 
        if (index > 3)
                return -EINVAL;
@@ -258,8 +321,11 @@ int ehci_hcd_init(int index, enum usb_init_type init,
 
        usb_power_config(index);
        usb_oc_config(index);
+
+#if defined(CONFIG_MX6)
        usb_internal_phy_clock_gate(index, 1);
        usb_phy_enable(index, ehci);
+#endif
        type = board_usb_phy_mode(index);
 
        *hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
@@ -272,6 +338,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
                return -ENODEV;
        if (type == USB_INIT_DEVICE)
                return 0;
+
        setbits_le32(&ehci->usbmode, CM_HOST);
        writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
        setbits_le32(&ehci->portsc, USB_EN);