dm: usb: exynos: Drop legacy USB code

Drop the code that doesn't use driver model for USB.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 86cf6312febc30b7e142146c3b4763a6a871d5a6..18e9251b64f5c1cadd5e4121fb99a753c70a75a6 100644 (file)
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -25,14 +25,12 @@
 /* Declare global data pointer */
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_DM_USB
 struct exynos_ehci_platdata {
        struct usb_platdata usb_plat;
        fdt_addr_t hcd_base;
        fdt_addr_t phy_base;
        struct gpio_desc vbus_gpio;
 };
-#endif
 
 /**
  * Contains pointers to register base addresses
@@ -42,16 +40,8 @@ struct exynos_ehci {
        struct ehci_ctrl ctrl;
        struct exynos_usb_phy *usb;
        struct ehci_hccr *hcd;
-#ifndef CONFIG_DM_USB
-       struct gpio_desc vbus_gpio;
-#endif
 };
 
-#ifndef CONFIG_DM_USB
-static struct exynos_ehci exynos;
-#endif
-
-#ifdef CONFIG_DM_USB
 static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
 {
        struct exynos_ehci_platdata *plat = dev_get_platdata(dev);
@@ -91,55 +81,6 @@ static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
 
        return 0;
 }
-#else
-static int exynos_usb_parse_dt(const void *blob, struct exynos_ehci *exynos)
-{
-       fdt_addr_t addr;
-       unsigned int node;
-       int depth;
-
-       node = fdtdec_next_compatible(blob, 0, COMPAT_SAMSUNG_EXYNOS_EHCI);
-       if (node <= 0) {
-               debug("EHCI: Can't get device node for ehci\n");
-               return -ENODEV;
-       }
-
-       /*
-        * Get the base address for EHCI controller from the device node
-        */
-       addr = fdtdec_get_addr(blob, node, "reg");
-       if (addr == FDT_ADDR_T_NONE) {
-               debug("Can't get the EHCI register address\n");
-               return -ENXIO;
-       }
-
-       exynos->hcd = (struct ehci_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_EXYNOS_USB_PHY, &depth);
-       if (node <= 0) {
-               debug("EHCI: Can't get device node for usb-phy controller\n");
-               return -ENODEV;
-       }
-
-       /*
-        * Get the base address for usbphy from the device node
-        */
-       exynos->usb = (struct exynos_usb_phy *)fdtdec_get_addr(blob, node,
-                                                               "reg");
-       if (exynos->usb == NULL) {
-               debug("Can't get the usbphy register address\n");
-               return -ENXIO;
-       }
-
-       return 0;
-}
-#endif
 
 static void exynos5_setup_usb_phy(struct exynos_usb_phy *usb)
 {
@@ -270,63 +211,6 @@ static void reset_usb_phy(struct exynos_usb_phy *usb)
        set_usbhost_phy_ctrl(POWER_USB_HOST_PHY_CTRL_DISABLE);
 }
 
-#ifndef CONFIG_DM_USB
-/*
- * EHCI-initialization
- * Create the appropriate control structures to manage
- * a new EHCI host controller.
- */
-int ehci_hcd_init(int index, enum usb_init_type init,
-               struct ehci_hccr **hccr, struct ehci_hcor **hcor)
-{
-       struct exynos_ehci *ctx = &exynos;
-
-#ifdef CONFIG_OF_CONTROL
-       if (exynos_usb_parse_dt(gd->fdt_blob, ctx)) {
-               debug("Unable to parse device tree for ehci-exynos\n");
-               return -ENODEV;
-       }
-#else
-       ctx->usb = (struct exynos_usb_phy *)samsung_get_base_usb_phy();
-       ctx->hcd = (struct ehci_hccr *)samsung_get_base_usb_ehci();
-#endif
-
-#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
-
-       setup_usb_phy(ctx->usb);
-
-       board_usb_init(index, init);
-
-       *hccr = ctx->hcd;
-       *hcor = (struct ehci_hcor *)((uint32_t) *hccr
-                               + HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
-
-       debug("Exynos5-ehci: init hccr %x and hcor %x hc_length %d\n",
-               (uint32_t)*hccr, (uint32_t)*hcor,
-               (uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
-
-       return 0;
-}
-
-/*
- * Destroy the appropriate control structures corresponding
- * the EHCI host controller.
- */
-int ehci_hcd_stop(int index)
-{
-       struct exynos_ehci *ctx = &exynos;
-
-       reset_usb_phy(ctx->usb);
-
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_DM_USB
 static int ehci_usb_probe(struct udevice *dev)
 {
        struct exynos_ehci_platdata *plat = dev_get_platdata(dev);
@@ -377,4 +261,3 @@ U_BOOT_DRIVER(usb_ehci) = {
        .platdata_auto_alloc_size = sizeof(struct exynos_ehci_platdata),
        .flags  = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif

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

diff --git a/include/fdtdec.h b/include/fdtdec.h
index 659047097a1001ca5f007e55b16343ddc214ca78..f11475b5fddf43fe75e27b58b57ceec4c78c78f0 100644 (file)
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -145,8 +145,6 @@ enum fdt_compat_id {
        COMPAT_SAMSUNG_EXYNOS5_SOUND,   /* Exynos Sound */
        COMPAT_WOLFSON_WM8994_CODEC,    /* Wolfson WM8994 Sound Codec */
        COMPAT_GOOGLE_CROS_EC_KEYB,     /* Google CROS_EC Keyboard */
-       COMPAT_SAMSUNG_EXYNOS_EHCI,     /* Exynos EHCI controller */
-       COMPAT_SAMSUNG_EXYNOS5_XHCI,    /* Exynos5 XHCI controller */
        COMPAT_SAMSUNG_EXYNOS_USB_PHY,  /* Exynos phy controller for usb2.0 */
        COMPAT_SAMSUNG_EXYNOS5_USB3_PHY,/* Exynos phy controller for usb3.0 */
        COMPAT_SAMSUNG_EXYNOS_TMU,      /* Exynos TMU */

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 80b897a21cd69a88ce5d3fe1398d23da11339f67..b76d9cad83fba04d67775cf7cd500d68e0a33fd0 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -44,8 +44,6 @@ static const char * const compat_names[COMPAT_COUNT] = {
        COMPAT(SAMSUNG_EXYNOS5_SOUND, "samsung,exynos-sound"),
        COMPAT(WOLFSON_WM8994_CODEC, "wolfson,wm8994-codec"),
        COMPAT(GOOGLE_CROS_EC_KEYB, "google,cros-ec-keyb"),
-       COMPAT(SAMSUNG_EXYNOS_EHCI, "samsung,exynos-ehci"),
-       COMPAT(SAMSUNG_EXYNOS5_XHCI, "samsung,exynos5250-xhci"),
        COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"),
        COMPAT(SAMSUNG_EXYNOS5_USB3_PHY, "samsung,exynos5250-usb3-phy"),
        COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"),