global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

[platform/kernel/u-boot.git] / drivers / usb / host / ehci-mx5.c

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 970bbe9..c112798 100644 (file)
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -11,6 +11,7 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <usb/ehci-ci.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
@@ -227,52 +228,6 @@ __weak void mx5_ehci_powerup_fixup(struct ehci_ctrl *ctrl, uint32_t *status_reg,
        mdelay(50);
 }
 
-#if !CONFIG_IS_ENABLED(DM_USB)
-static const struct ehci_ops mx5_ehci_ops = {
-       .powerup_fixup          = mx5_ehci_powerup_fixup,
-};
-
-int ehci_hcd_init(int index, enum usb_init_type init,
-               struct ehci_hccr **hccr, struct ehci_hcor **hcor)
-{
-       struct usb_ehci *ehci;
-
-       /* The only user for this is efikamx-usb */
-       ehci_set_controller_priv(index, NULL, &mx5_ehci_ops);
-       set_usboh3_clk();
-       enable_usboh3_clk(true);
-       set_usb_phy_clk();
-       enable_usb_phy1_clk(true);
-       enable_usb_phy2_clk(true);
-       mdelay(1);
-
-       /* Do board specific initialization */
-       board_ehci_hcd_init(CONFIG_MXC_USB_PORT);
-
-       ehci = (struct usb_ehci *)(OTG_BASE_ADDR +
-               (0x200 * CONFIG_MXC_USB_PORT));
-       *hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
-       *hcor = (struct ehci_hcor *)((uint32_t)*hccr +
-                       HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
-       setbits_le32(&ehci->usbmode, CM_HOST);
-
-       __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
-       setbits_le32(&ehci->portsc, USB_EN);
-
-       mxc_set_usbcontrol(CONFIG_MXC_USB_PORT, CONFIG_MXC_USB_FLAGS);
-       mdelay(10);
-
-       /* Do board specific post-initialization */
-       board_ehci_hcd_postinit(ehci, CONFIG_MXC_USB_PORT);
-
-       return 0;
-}
-
-int ehci_hcd_stop(int index)
-{
-       return 0;
-}
-#else /* CONFIG_IS_ENABLED(DM_USB) */
 struct ehci_mx5_priv_data {
        struct ehci_ctrl ctrl;
        struct usb_ehci *ehci;
@@ -287,7 +242,7 @@ static const struct ehci_ops mx5_ehci_ops = {
 
 static int ehci_usb_of_to_plat(struct udevice *dev)
 {
-       struct usb_platdata *plat = dev_get_plat(dev);
+       struct usb_plat *plat = dev_get_plat(dev);
        const char *mode;
 
        mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "dr_mode", NULL);
@@ -305,7 +260,7 @@ static int ehci_usb_of_to_plat(struct udevice *dev)
 
 static int ehci_usb_probe(struct udevice *dev)
 {
-       struct usb_platdata *plat = dev_get_plat(dev);
+       struct usb_plat *plat = dev_get_plat(dev);
        struct usb_ehci *ehci = dev_read_addr_ptr(dev);
        struct ehci_mx5_priv_data *priv = dev_get_priv(dev);
        enum usb_init_type type = plat->init_type;
@@ -321,7 +276,7 @@ static int ehci_usb_probe(struct udevice *dev)
        mdelay(1);
 
        priv->ehci = ehci;
-       priv->portnr = dev->seq;
+       priv->portnr = dev_seq(dev);
        priv->init_type = type;
 
        ret = device_get_supply_regulator(dev, "vbus-supply",
@@ -344,10 +299,10 @@ static int ehci_usb_probe(struct udevice *dev)
                        HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
        setbits_le32(&ehci->usbmode, CM_HOST);
 
-       __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+       __raw_writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
        setbits_le32(&ehci->portsc, USB_EN);
 
-       mxc_set_usbcontrol(priv->portnr, CONFIG_MXC_USB_FLAGS);
+       mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS);
        mdelay(10);
 
        return ehci_register(dev, hccr, hcor, &mx5_ehci_ops, 0,
@@ -367,8 +322,7 @@ U_BOOT_DRIVER(usb_mx5) = {
        .probe  = ehci_usb_probe,
        .remove = ehci_deregister,
        .ops    = &ehci_usb_ops,
-       .plat_auto      = sizeof(struct usb_platdata),
+       .plat_auto      = sizeof(struct usb_plat),
        .priv_auto      = sizeof(struct ehci_mx5_priv_data),
        .flags  = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif /* !CONFIG_IS_ENABLED(DM_USB) */