diff options
| author | Tom Rini <trini@ti.com> | 2013-01-11 14:38:24 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-01-11 14:38:24 -0700 |
| commit | 7a8e739cd5bc0c48511d343f469af89a88a3294d (patch) | |
| tree | 2198c265cd9d83d58b42ab8a8e66c2fff4d4545a /drivers/usb | |
| parent | 6fb4d74e59750b43f00d460c569e8a30c67c5bb0 (diff) | |
| parent | 59ee45ee91cc91b392a8e2684bfcb8c933ce4967 (diff) | |
| download | u-boot-imx-7a8e739cd5bc0c48511d343f469af89a88a3294d.zip u-boot-imx-7a8e739cd5bc0c48511d343f469af89a88a3294d.tar.gz u-boot-imx-7a8e739cd5bc0c48511d343f469af89a88a3294d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ohci-at91.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 9532dd9..efd711d 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -41,7 +41,8 @@ int usb_cpu_init(void) writel(get_pllb_init(), &pmc->pllbr); while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) ; -#elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) +#elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \ + defined(CONFIG_AT91SAM9X5) /* Enable UPLL */ writel(readl(&pmc->uckr) | AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr); @@ -81,7 +82,8 @@ int usb_cpu_stop(void) writel(0, &pmc->pllbr); while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0) ; -#elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) +#elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \ + defined(CONFIG_AT91SAM9X5) /* Disable UPLL */ writel(readl(&pmc->uckr) & (~AT91_PMC_UPLLEN), &pmc->uckr); while ((readl(&pmc->sr) & AT91_PMC_LOCKU) == AT91_PMC_LOCKU) |