diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 20:01:48 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 20:01:48 +0100 |
| commit | 612404c28a64a6df300642a1550a65dcc8e01f82 (patch) | |
| tree | 5be664967ba39c93dc27da5cc547d350e7c0fc17 /drivers/usb/host | |
| parent | ea33fb1a32e8e3f408b311823cabbb7453148f80 (diff) | |
| parent | ac81e1ccf7135d8004763bbf9bef1d95a03fbe92 (diff) | |
| download | talos-obmc-uboot-612404c28a64a6df300642a1550a65dcc8e01f82.tar.gz talos-obmc-uboot-612404c28a64a6df300642a1550a65dcc8e01f82.zip | |
Merge 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/usb/host')
| -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 9532dd9ef6..efd711d489 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) |
