common: Drop linux/delay.h from common header

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

diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index f320d3eb5d075327ee03fcce7ae4a0150e6e3746..824c620e63873c4067061de7aad40857a71060e6 100644 (file)
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -1,28 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale i.MX28 USB Host driver
  *
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * on behalf of DENX Software Engineering GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <errno.h>
+#include <linux/delay.h>
 
 #include "ehci.h"
 
@@ -89,7 +77,18 @@ static int ehci_mxs_toggle_clock(const struct ehci_mxs_port *port, int enable)
        return 0;
 }
 
-int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
+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;
@@ -101,6 +100,10 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
                return -EINVAL;
        }
 
+       ret = board_ehci_hcd_init(index);
+       if (ret)
+               return ret;
+
        port = &mxs_port[index];
 
        /* Reset the PHY block */
@@ -153,7 +156,7 @@ int ehci_hcd_stop(int index)
 
        tmp = ehci_readl(&hcor->or_usbcmd);
        tmp &= ~CMD_RUN;
-       ehci_writel(tmp, &hcor->or_usbcmd);
+       ehci_writel(&hcor->or_usbcmd, tmp);
 
        /* Disable the PHY */
        tmp = USBPHY_PWD_RXPWDRX | USBPHY_PWD_RXPWDDIFF |
@@ -165,5 +168,7 @@ int ehci_hcd_stop(int index)
        /* Disable USB clock */
        ret = ehci_mxs_toggle_clock(port, 0);
 
+       board_ehci_hcd_exit(index);
+
        return ret;
 }