diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-20 17:32:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-20 17:32:48 -0500 |
| commit | 20680b560a17fb29c862de77930cfbf76b24f83c (patch) | |
| tree | f66975032b21063ad86fd01553983b3c79b398cf /board/siemens/taurus/taurus.c | |
| parent | db6ce2312dcae87619136457d1f9df56789f630a (diff) | |
| parent | 2a0b9ea3067b00366455b0504056cb6728a0b865 (diff) | |
| download | talos-obmc-uboot-20680b560a17fb29c862de77930cfbf76b24f83c.tar.gz talos-obmc-uboot-20680b560a17fb29c862de77930cfbf76b24f83c.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'board/siemens/taurus/taurus.c')
| -rw-r--r-- | board/siemens/taurus/taurus.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index 72c5e6083d..b0385d8a6e 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -18,7 +18,6 @@ #include <asm/arch/at91sam9260_matrix.h> #include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91_common.h> -#include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> #include <asm/arch/gpio.h> #include <asm/arch/at91sam9_sdramc.h> @@ -290,17 +289,13 @@ void spi_cs_deactivate(struct spi_slave *slave) void at91_udp_hw_init(void) { - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; - /* Enable PLLB */ - writel(get_pllb_init(), &pmc->pllbr); - while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) - ; + at91_pllb_clk_enable(get_pllb_init()); /* Enable UDPCK clock, MCK is enabled in at91_clock_init() */ at91_periph_clk_enable(ATMEL_ID_UDP); - writel(AT91SAM926x_PMC_UDP, &pmc->scer); + at91_system_clk_enable(AT91SAM926x_PMC_UDP); } struct at91_udc_data board_udc_data = { |
