From: Albert ARIBAUD Date: Thu, 30 May 2013 12:45:06 +0000 (+0200) Subject: Merge branch 'u-boot/master' into 'u-boot-arm/master' X-Git-Tag: v2013.07-rc1~54 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a19b0dd62d7b8efc658fa1aa685ff5665878f3ee;p=u-boot Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c --- a19b0dd62d7b8efc658fa1aa685ff5665878f3ee diff --cc drivers/usb/host/ohci-at91.c index 086cd0fe5d,aa5cf57aed..2060a3eb46 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@@ -54,13 -54,8 +54,13 @@@ int usb_cpu_init(void #endif /* Enable USB host clock. */ +#ifdef CONFIG_SAMA5D3 + writel(1 << (ATMEL_ID_UHP - 32), &pmc->pcer1); +#else writel(1 << ATMEL_ID_UHP, &pmc->pcer); +#endif + - #ifdef CONFIG_AT91SAM9261 + #if defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10) writel(ATMEL_PMC_UHP | AT91_PMC_HCK0, &pmc->scer); #else writel(ATMEL_PMC_UHP, &pmc->scer); @@@ -74,13 -69,8 +74,13 @@@ int usb_cpu_stop(void at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; /* Disable USB host clock. */ +#ifdef CONFIG_SAMA5D3 + writel(1 << (ATMEL_ID_UHP - 32), &pmc->pcdr1); +#else writel(1 << ATMEL_ID_UHP, &pmc->pcdr); +#endif + - #ifdef CONFIG_AT91SAM9261 + #if defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10) writel(ATMEL_PMC_UHP | AT91_PMC_HCK0, &pmc->scdr); #else writel(ATMEL_PMC_UHP, &pmc->scdr);