Merge branch 'master' of git://git.denx.de/u-boot

[u-boot] / drivers / usb / host / ehci-mpc512x.c

diff --git a/drivers/usb/host/ehci-mpc512x.c b/drivers/usb/host/ehci-mpc512x.c
index d36010826b3241219e6cc6864e961045a4cde368..b320c4a4e2d08c5949b1423d729d2f7b5f26dc08 100644 (file)
--- a/drivers/usb/host/ehci-mpc512x.c
+++ b/drivers/usb/host/ehci-mpc512x.c
@@ -10,20 +10,7 @@
  *
  * Author: Tor Krill tor@excito.com
  *
- * 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
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -33,7 +20,6 @@
 #include <usb/ehci-fsl.h>
 
 #include "ehci.h"
-#include "ehci-core.h"
 
 static void fsl_setup_phy(volatile struct ehci_hcor *);
 static void fsl_platform_set_host_mode(volatile struct usb_ehci *ehci);
@@ -46,21 +32,22 @@ static void usb_platform_dr_init(volatile struct usb_ehci *ehci);
  * This code is derived from EHCI FSL USB Linux driver for MPC5121
  *
  */
-int ehci_hcd_init(void)
+int ehci_hcd_init(int index, enum usb_init_type init,
+               struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 {
        volatile struct usb_ehci *ehci;
 
        /* Hook the memory mapped registers for EHCI-Controller */
-       ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
-       hccr = (struct ehci_hccr *)((uint32_t)&(ehci->caplength));
-       hcor = (struct ehci_hcor *)((uint32_t) hccr +
-                               HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
+       ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB1_ADDR;
+       *hccr = (struct ehci_hccr *)((uint32_t)&(ehci->caplength));
+       *hcor = (struct ehci_hcor *)((uint32_t) *hccr +
+                               HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
 
        /* configure interface for UTMI_WIDE */
        usb_platform_dr_init(ehci);
 
        /* Init Phy USB0 to UTMI+ */
-       fsl_setup_phy(hcor);
+       fsl_setup_phy(*hcor);
 
        /* Set to host mode */
        fsl_platform_set_host_mode(ehci);
@@ -89,20 +76,14 @@ int ehci_hcd_init(void)
  * Destroy the appropriate control structures corresponding
  * the the EHCI host controller.
  */
-int ehci_hcd_stop(void)
+int ehci_hcd_stop(int index)
 {
        volatile struct usb_ehci *ehci;
        int exit_status = 0;
 
-       if (hcor) {
-               /* Unhook struct */
-               hccr = NULL;
-               hcor = NULL;
-
-               /* Reset the USB controller */
-               ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
-               exit_status = reset_usb_controller(ehci);
-       }
+       /* Reset the USB controller */
+       ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB1_ADDR;
+       exit_status = reset_usb_controller(ehci);
 
        return exit_status;
 }