ehci-mxs: Remove non-DM code

This code is not enabled anywhere, drop it.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index 9a614955fc16686af8b03b885746adb74b82d004..147b2fa145d6533095314bbd8cfe90569f32f02f 100644 (file)
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -112,82 +112,6 @@ static int __ehci_hcd_stop(struct ehci_mxs_port *port)
        return ehci_mxs_toggle_clock(port, 0);
 }
 
-#if !CONFIG_IS_ENABLED(DM_USB)
-static const struct ehci_mxs_port mxs_port[] = {
-#ifdef CONFIG_EHCI_MXS_PORT0
-       {
-               MXS_USBCTRL0_BASE,
-               (struct mxs_usbphy_regs *)MXS_USBPHY0_BASE,
-               (struct mxs_register_32 *)(MXS_CLKCTRL_BASE +
-                       offsetof(struct mxs_clkctrl_regs,
-                       hw_clkctrl_pll0ctrl0_reg)),
-               CLKCTRL_PLL0CTRL0_EN_USB_CLKS | CLKCTRL_PLL0CTRL0_POWER,
-               CLKCTRL_PLL0CTRL0_EN_USB_CLKS,
-               HW_DIGCTL_CTRL_USB0_CLKGATE,
-       },
-#endif
-#ifdef CONFIG_EHCI_MXS_PORT1
-       {
-               MXS_USBCTRL1_BASE,
-               (struct mxs_usbphy_regs *)MXS_USBPHY1_BASE,
-               (struct mxs_register_32 *)(MXS_CLKCTRL_BASE +
-                       offsetof(struct mxs_clkctrl_regs,
-                       hw_clkctrl_pll1ctrl0_reg)),
-               CLKCTRL_PLL1CTRL0_EN_USB_CLKS | CLKCTRL_PLL1CTRL0_POWER,
-               CLKCTRL_PLL1CTRL0_EN_USB_CLKS,
-               HW_DIGCTL_CTRL_USB1_CLKGATE,
-       },
-#endif
-};
-
-int __weak board_ehci_hcd_init(int port)
-{
-       return 0;
-}
-
-int __weak board_ehci_hcd_exit(int port)
-{
-       return 0;
-}
-
-int ehci_hcd_init(int index, enum usb_init_type init,
-               struct ehci_hccr **hccr, struct ehci_hcor **hcor)
-{
-
-       int ret;
-       const struct ehci_mxs_port *port;
-
-       if ((index < 0) || (index >= ARRAY_SIZE(mxs_port))) {
-               printf("Invalid port index (index = %d)!\n", index);
-               return -EINVAL;
-       }
-
-       ret = board_ehci_hcd_init(index);
-       if (ret)
-               return ret;
-
-       port = &mxs_port[index];
-       return __ehci_hcd_init(port, init, hccr, hcor);
-}
-
-int ehci_hcd_stop(int index)
-{
-       int ret;
-       const struct ehci_mxs_port *port;
-
-       if ((index < 0) || (index >= ARRAY_SIZE(mxs_port))) {
-               printf("Invalid port index (index = %d)!\n", index);
-               return -EINVAL;
-       }
-
-       port = &mxs_port[index];
-
-       ret = __ehci_hcd_stop(port);
-       board_ehci_hcd_exit(index);
-
-       return ret;
-}
-#else /* CONFIG_IS_ENABLED(DM_USB) */
 struct ehci_mxs_priv_data {
        struct ehci_ctrl ctrl;
        struct usb_ehci *ehci;
@@ -367,4 +291,3 @@ U_BOOT_DRIVER(usb_mxs) = {
        .priv_auto = sizeof(struct ehci_mxs_priv_data),
        .flags  = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif /* !CONFIG_IS_ENABLED(DM_USB) */

diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index ab466b65ac43990790b84feea5292df8e24d6f2d..06b90e42b4c38c130d3b5ac70a6332aeddc51a29 100644 (file)
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -16,7 +16,6 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_MXS_PORT0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
 #endif
 

diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 3fb00031075d1a3a42efffb63e8f3cd9939487b5..94b916dbdb13a459b76b5c6e828ffb7d4ebb9250 100644 (file)
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -21,7 +21,6 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_MXS_PORT0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
 #endif
 

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index fe096d424c3a99caf431db8e61aa7ee250fc0154..10f48c12565d67124429830d7387d02af0bb5471 100644 (file)
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -35,7 +35,6 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_MXS_PORT1
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #endif