projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
drivers
/
net
/
bfin_mac.c
diff --git
a/drivers/net/bfin_mac.c
b/drivers/net/bfin_mac.c
index c63398ebf8d1235fa7a187f825ae55db429e81b2..0c2d2ef1a9671ad783d1d3da2cf9a04d2b793e96 100644
(file)
--- a/
drivers/net/bfin_mac.c
+++ b/
drivers/net/bfin_mac.c
@@
-16,6
+16,7
@@
#include <linux/mii.h>
#include <asm/blackfin.h>
#include <linux/mii.h>
#include <asm/blackfin.h>
+#include <asm/clock.h>
#include <asm/portmux.h>
#include <asm/mach-common/bits/dma.h>
#include <asm/mach-common/bits/emac.h>
#include <asm/portmux.h>
#include <asm/mach-common/bits/dma.h>
#include <asm/mach-common/bits/emac.h>
@@
-122,8
+123,6
@@
static int bfin_EMAC_send(struct eth_device *dev, void *packet, int length)
{
int i;
int result = 0;
{
int i;
int result = 0;
- unsigned int *buf;
- buf = (unsigned int *)packet;
if (length <= 0) {
printf("Ethernet: bad packet size: %d\n", length);
if (length <= 0) {
printf("Ethernet: bad packet size: %d\n", length);
@@
-261,6
+260,8
@@
static int bfin_miiphy_init(struct eth_device *dev, int *opmode)
*opmode = 0;
bfin_write_EMAC_MMC_CTL(RSTC | CROLL);
*opmode = 0;
bfin_write_EMAC_MMC_CTL(RSTC | CROLL);
+ bfin_write_EMAC_VLAN1(EMAC_VLANX_DEF_VAL);
+ bfin_write_EMAC_VLAN2(EMAC_VLANX_DEF_VAL);
/* Initialize the TX DMA channel registers */
bfin_write_DMA2_X_COUNT(0);
/* Initialize the TX DMA channel registers */
bfin_write_DMA2_X_COUNT(0);