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 /drivers/net | |
| parent | db6ce2312dcae87619136457d1f9df56789f630a (diff) | |
| parent | 2a0b9ea3067b00366455b0504056cb6728a0b865 (diff) | |
| download | u-boot-imx-20680b560a17fb29c862de77930cfbf76b24f83c.zip u-boot-imx-20680b560a17fb29c862de77930cfbf76b24f83c.tar.gz u-boot-imx-20680b560a17fb29c862de77930cfbf76b24f83c.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/at91_emac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index 2659592..9151600 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -12,7 +12,7 @@ #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_emac.h> -#include <asm/arch/at91_pmc.h> +#include <asm/arch/clk.h> #include <asm/arch/at91_pio.h> #include <net.h> #include <netdev.h> @@ -321,7 +321,6 @@ static int at91emac_init(struct eth_device *netdev, bd_t *bd) emac_device *dev; at91_emac_t *emac; at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO; - at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; emac = (at91_emac_t *) netdev->iobase; dev = (emac_device *) netdev->priv; @@ -347,7 +346,8 @@ static int at91emac_init(struct eth_device *netdev, bd_t *bd) writel(value, &pio->piob.pdr); writel(value, &pio->piob.bsr); - writel(1 << ATMEL_ID_EMAC, &pmc->pcer); + at91_periph_clk_enable(ATMEL_ID_EMAC); + writel(readl(&emac->ctl) | AT91_EMAC_CTL_CSR, &emac->ctl); /* Init Ethernet buffers */ @@ -452,10 +452,10 @@ static int at91emac_recv(struct eth_device *netdev) static int at91emac_write_hwaddr(struct eth_device *netdev) { at91_emac_t *emac; - at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; emac = (at91_emac_t *) netdev->iobase; - writel(1 << ATMEL_ID_EMAC, &pmc->pcer); + at91_periph_clk_enable(ATMEL_ID_EMAC); + debug_cond(DEBUG_AT91EMAC, "init MAC-ADDR %02x:%02x:%02x:%02x:%02x:%02x\n", netdev->enetaddr[5], netdev->enetaddr[4], netdev->enetaddr[3], |