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 820e2e56ef426678177412bd1b798741c599e68a..8ceabaf45c1b98501789b1039d03e8a937072b89 100644 (file)
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -1,53 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2006
  * DENX Software Engineering <mk@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 
 #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
 
-#include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pmc.h>
 #include <asm/arch/clk.h>
 
 int usb_cpu_init(void)
 {
-       at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
-
 #ifdef CONFIG_USB_ATMEL_CLK_SEL_PLLB
-       /* Enable PLLB */
-       writel(get_pllb_init(), &pmc->pllbr);
-       while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
-               ;
+       if (at91_pllb_clk_enable(get_pllb_init()))
+               return -1;
+
 #ifdef CONFIG_AT91SAM9N12
-       writel(AT91_PMC_USBS_USB_PLLB | AT91_PMC_USB_DIV_2, &pmc->usb);
+       at91_usb_clk_init(AT91_PMC_USBS_USB_PLLB | AT91_PMC_USB_DIV_2);
 #endif
 #elif defined(CONFIG_USB_ATMEL_CLK_SEL_UPLL)
-       /* Enable UPLL */
-       writel(readl(&pmc->uckr) | AT91_PMC_UPLLEN | AT91_PMC_BIASEN,
-               &pmc->uckr);
-       while ((readl(&pmc->sr) & AT91_PMC_LOCKU) != AT91_PMC_LOCKU)
-               ;
-
-       /* Select PLLA as input clock of OHCI */
-       writel(AT91_PMC_USBS_USB_UPLL | AT91_PMC_USBDIV_10, &pmc->usb);
+       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. */
-#ifdef CPU_HAS_PCR
        at91_periph_clk_enable(ATMEL_ID_UHP);
-#else
-       writel(1 << ATMEL_ID_UHP, &pmc->pcer);
-#endif
 
+       at91_system_clk_enable(ATMEL_PMC_UHP);
 #if defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10)
-       writel(ATMEL_PMC_UHP | AT91_PMC_HCK0, &pmc->scer);
-#else
-       writel(ATMEL_PMC_UHP, &pmc->scer);
+       at91_system_clk_enable(AT91_PMC_HCK0);
 #endif
 
        return 0;
@@ -55,34 +38,24 @@ int usb_cpu_init(void)
 
 int usb_cpu_stop(void)
 {
-       at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
-
-       /* Disable USB host clock. */
-#ifdef CPU_HAS_PCR
        at91_periph_clk_disable(ATMEL_ID_UHP);
-#else
-       writel(1 << ATMEL_ID_UHP, &pmc->pcdr);
-#endif
 
+       at91_system_clk_disable(ATMEL_PMC_UHP);
 #if defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10)
-       writel(ATMEL_PMC_UHP | AT91_PMC_HCK0, &pmc->scdr);
-#else
-       writel(ATMEL_PMC_UHP, &pmc->scdr);
+       at91_system_clk_disable(AT91_PMC_HCK0);
 #endif
 
 #ifdef CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #ifdef CONFIG_AT91SAM9N12
-       writel(0, &pmc->usb);
+       at91_usb_clk_init(0);
 #endif
-       /* 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)
-       /* Disable UPLL */
-       writel(readl(&pmc->uckr) & (~AT91_PMC_UPLLEN), &pmc->uckr);
-       while ((readl(&pmc->sr) & AT91_PMC_LOCKU) == AT91_PMC_LOCKU)
-               ;
+       if (at91_upll_clk_disable())
+               return -1;
 #endif
 
        return 0;