dm: usb: exynos: Drop legacy USB code

[karo-tx-uboot.git] / drivers / usb / host / xhci-exynos5.c

diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index 23c7ecc5d8699714b83a9dabc8be59a8df4fc104..a27a79632b896aa1257dbfcc61d0b29bba687785 100644 (file)
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -33,36 +33,24 @@
 /* Declare global data pointer */
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_DM_USB
 struct exynos_xhci_platdata {
        fdt_addr_t hcd_base;
        fdt_addr_t phy_base;
        struct gpio_desc vbus_gpio;
 };
-#endif
 
 /**
  * Contains pointers to register base addresses
  * for the usb controller.
  */
 struct exynos_xhci {
-#ifdef CONFIG_DM_USB
        struct usb_platdata usb_plat;
-#endif
        struct xhci_ctrl ctrl;
        struct exynos_usb3_phy *usb3_phy;
        struct xhci_hccr *hcd;
        struct dwc3 *dwc3_reg;
-#ifndef CONFIG_DM_USB
-       struct gpio_desc vbus_gpio;
-#endif
 };
 
-#ifndef CONFIG_DM_USB
-static struct exynos_xhci exynos;
-#endif
-
-#ifdef CONFIG_DM_USB
 static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
 {
        struct exynos_xhci_platdata *plat = dev_get_platdata(dev);
@@ -102,54 +90,6 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
 
        return 0;
 }
-#else
-static int exynos_usb3_parse_dt(const void *blob, struct exynos_xhci *exynos)
-{
-       fdt_addr_t addr;
-       unsigned int node;
-       int depth;
-
-       node = fdtdec_next_compatible(blob, 0, COMPAT_SAMSUNG_EXYNOS5_XHCI);
-       if (node <= 0) {
-               debug("XHCI: Can't get device node for xhci\n");
-               return -ENODEV;
-       }
-
-       /*
-        * Get the base address for XHCI controller from the device node
-        */
-       addr = fdtdec_get_addr(blob, node, "reg");
-       if (addr == FDT_ADDR_T_NONE) {
-               debug("Can't get the XHCI register base address\n");
-               return -ENXIO;
-       }
-       exynos->hcd = (struct xhci_hccr *)addr;
-
-       /* Vbus gpio */
-       gpio_request_by_name_nodev(blob, node, "samsung,vbus-gpio", 0,
-                                  &exynos->vbus_gpio, GPIOD_IS_OUT);
-
-       depth = 0;
-       node = fdtdec_next_compatible_subnode(blob, node,
-                               COMPAT_SAMSUNG_EXYNOS5_USB3_PHY, &depth);
-       if (node <= 0) {
-               debug("XHCI: Can't get device node for usb3-phy controller\n");
-               return -ENODEV;
-       }
-
-       /*
-        * Get the base address for usbphy from the device node
-        */
-       exynos->usb3_phy = (struct exynos_usb3_phy *)fdtdec_get_addr(blob, node,
-                                                               "reg");
-       if (exynos->usb3_phy == NULL) {
-               debug("Can't get the usbphy register address\n");
-               return -ENXIO;
-       }
-
-       return 0;
-}
-#endif
 
 static void exynos5_usb3_phy_init(struct exynos_usb3_phy *phy)
 {
@@ -340,53 +280,6 @@ static void exynos_xhci_core_exit(struct exynos_xhci *exynos)
        exynos5_usb3_phy_exit(exynos->usb3_phy);
 }
 
-#ifndef CONFIG_DM_USB
-int xhci_hcd_init(int index, struct xhci_hccr **hccr, struct xhci_hcor **hcor)
-{
-       struct exynos_xhci *ctx = &exynos;
-       int ret;
-
-#ifdef CONFIG_OF_CONTROL
-       exynos_usb3_parse_dt(gd->fdt_blob, ctx);
-#else
-       ctx->usb3_phy = (struct exynos_usb3_phy *)samsung_get_base_usb3_phy();
-       ctx->hcd = (struct xhci_hccr *)samsung_get_base_usb_xhci();
-#endif
-
-       ctx->dwc3_reg = (struct dwc3 *)((char *)(ctx->hcd) + DWC3_REG_OFFSET);
-
-#ifdef CONFIG_OF_CONTROL
-       /* setup the Vbus gpio here */
-       if (dm_gpio_is_valid(&ctx->vbus_gpio))
-               dm_gpio_set_value(&ctx->vbus_gpio, 1);
-#endif
-
-       ret = exynos_xhci_core_init(ctx);
-       if (ret) {
-               puts("XHCI: failed to initialize controller\n");
-               return -EINVAL;
-       }
-
-       *hccr = (ctx->hcd);
-       *hcor = (struct xhci_hcor *)((uint32_t) *hccr
-                               + HC_LENGTH(xhci_readl(&(*hccr)->cr_capbase)));
-
-       debug("Exynos5-xhci: init hccr %x and hcor %x hc_length %d\n",
-               (uint32_t)*hccr, (uint32_t)*hcor,
-               (uint32_t)HC_LENGTH(xhci_readl(&(*hccr)->cr_capbase)));
-
-       return 0;
-}
-
-void xhci_hcd_stop(int index)
-{
-       struct exynos_xhci *ctx = &exynos;
-
-       exynos_xhci_core_exit(ctx);
-}
-#endif
-
-#ifdef CONFIG_DM_USB
 static int xhci_usb_probe(struct udevice *dev)
 {
        struct exynos_xhci_platdata *plat = dev_get_platdata(dev);
@@ -443,4 +336,3 @@ U_BOOT_DRIVER(usb_xhci) = {
        .priv_auto_alloc_size = sizeof(struct exynos_xhci),
        .flags  = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif