Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / drivers / usb / host / ohci-at91.c

diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index b2e03bc58bcf87892198213637c579aa49e2056c..8ceabaf45c1b98501789b1039d03e8a937072b89 100644 (file)
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -1,54 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2006
  * DENX Software Engineering <mk@denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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>
 
 #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/io.h>
-#include <asm/arch/at91_pmc.h>
 #include <asm/arch/clk.h>
 
 int usb_cpu_init(void)
 {
-       at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE;
-
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
-    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \
-    defined(CONFIG_AT91SAM9261)
-       /* Enable PLLB */
-       writel(get_pllb_init(), &pmc->pllbr);
-       while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
-               ;
+#ifdef CONFIG_USB_ATMEL_CLK_SEL_PLLB
+       if (at91_pllb_clk_enable(get_pllb_init()))
+               return -1;
+
+#ifdef CONFIG_AT91SAM9N12
+       at91_usb_clk_init(AT91_PMC_USBS_USB_PLLB | AT91_PMC_USB_DIV_2);
+#endif
+#elif defined(CONFIG_USB_ATMEL_CLK_SEL_UPLL)
+       if (at91_upll_clk_enable())
+               return -1;
+
+       at91_usb_clk_init(AT91_PMC_USBS_USB_UPLL | AT91_PMC_USBDIV_10);
 #endif
 
-       /* Enable USB host clock. */
-       writel(1 << AT91_ID_UHP, &pmc->pcer);
-#ifdef CONFIG_AT91SAM9261
-       writel(AT91_PMC_UHP | AT91_PMC_HCK0, &pmc->scer);
-#else
-       writel(AT91_PMC_UHP, &pmc->scer);
+       at91_periph_clk_enable(ATMEL_ID_UHP);
+
+       at91_system_clk_enable(ATMEL_PMC_UHP);
+#if defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10)
+       at91_system_clk_enable(AT91_PMC_HCK0);
 #endif
 
        return 0;
@@ -56,22 +38,24 @@ int usb_cpu_init(void)
 
 int usb_cpu_stop(void)
 {
-       at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE;
-
-       /* Disable USB host clock. */
-       writel(1 << AT91_ID_UHP, &pmc->pcdr);
-#ifdef CONFIG_AT91SAM9261
-       writel(AT91_PMC_UHP | AT91_PMC_HCK0, &pmc->scdr);
-#else
-       writel(AT91_PMC_UHP, &pmc->scdr);
+       at91_periph_clk_disable(ATMEL_ID_UHP);
+
+       at91_system_clk_disable(ATMEL_PMC_UHP);
+#if defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10)
+       at91_system_clk_disable(AT91_PMC_HCK0);
+#endif
+
+#ifdef CONFIG_USB_ATMEL_CLK_SEL_PLLB
+#ifdef CONFIG_AT91SAM9N12
+       at91_usb_clk_init(0);
 #endif
 
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
-    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20)
-       /* Disable PLLB */
-       writel(0, &pmc->pllbr);
-       while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0)
-               ;
+       if (at91_pllb_clk_disable())
+               return -1;
+
+#elif defined(CONFIG_USB_ATMEL_CLK_SEL_UPLL)
+       if (at91_upll_clk_disable())
+               return -1;
 #endif
 
        return 0;