GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/Blackfin: move on-chip MAC driver into drivers/net/

Browse source 
The Blackfin on-chip MAC driver was being managed in the BF537-STAMP board
directory, but it is not board specific, so relocate it to the drivers dir
so that other Blackfin ports can utilize it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2008-02-24 23:58:13 -05:00 • committed by Wolfgang Denk
parent 8a30b47009
commit 395bce4f59
4 changed files with 95 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/bf537-stamp/Makefile
View file

@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
COBJS := $(BOARD).o ether_bf537.o post-memory.o stm_m25p64.o cmd_bf537led.o nand.o COBJS := $(BOARD).o post-memory.o stm_m25p64.o cmd_bf537led.o nand.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS))

1
drivers/net/Makefile
View file

@ -27,6 +27,7 @@ LIB := $(obj)libnet.a
COBJS-y += 3c589.o COBJS-y += 3c589.o
COBJS-y += bcm570x.o bcm570x_autoneg.o 5701rls.o COBJS-y += bcm570x.o bcm570x_autoneg.o 5701rls.o
COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o
COBJS-y += cs8900.o COBJS-y += cs8900.o
COBJS-y += dc2114x.o COBJS-y += dc2114x.o
COBJS-y += dm9000x.o COBJS-y += dm9000x.o

150
board/bf537-stamp/ether_bf537.c → drivers/net/bfin_mac.c
View file

@ -1,39 +1,24 @@
/* /*
* ADI Blackfin 537 MAC Ethernet * Driver for Blackfin On-Chip MAC device
* *
* Copyright (c) 2005 Analog Device, Inc. * Copyright (c) 2005-2008 Analog Device, Inc.
* *
* See file CREDITS for list of people who contributed to this * Licensed under the GPL-2 or later.
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/ */
#include <common.h> #include <common.h>
#include <config.h> #include <config.h>
#include <asm/blackfin.h>
#include <net.h> #include <net.h>
#include <command.h> #include <command.h>
#include <malloc.h> #include <malloc.h>
#include "ether_bf537.h"
#include <asm/blackfin.h>
#include <asm/mach-common/bits/dma.h> #include <asm/mach-common/bits/dma.h>
#include <asm/mach-common/bits/emac.h> #include <asm/mach-common/bits/emac.h>
#include <asm/mach-common/bits/pll.h> #include <asm/mach-common/bits/pll.h>
#include "bfin_mac.h"
#ifdef CONFIG_POST #ifdef CONFIG_POST
#include <post.h> #include <post.h>
#endif #endif
@ -46,8 +31,6 @@
#define DEBUGF(fmt, args...) #define DEBUGF(fmt, args...)
#endif #endif
#if defined(CONFIG_CMD_NET)
#define RXBUF_BASE_ADDR 0xFF900000 #define RXBUF_BASE_ADDR 0xFF900000
#define TXBUF_BASE_ADDR 0xFF800000 #define TXBUF_BASE_ADDR 0xFF800000
#define TX_BUF_CNT 1 #define TX_BUF_CNT 1
@ -59,46 +42,32 @@ ADI_ETHER_BUFFER *rxbuf[PKTBUFSRX];
static u16 txIdx; /* index of the current RX buffer */ static u16 txIdx; /* index of the current RX buffer */
static u16 rxIdx; /* index of the current TX buffer */ static u16 rxIdx; /* index of the current TX buffer */
u8 SrcAddr[6];
u16 PHYregs[NO_PHY_REGS]; /* u16 PHYADDR; */ u16 PHYregs[NO_PHY_REGS]; /* u16 PHYADDR; */
/* DMAx_CONFIG values at DMA Restart */ /* DMAx_CONFIG values at DMA Restart */
const ADI_DMA_CONFIG_REG rxdmacfg = { 1, 1, 2, 0, 0, 0, 0, 5, 7 }; const ADI_DMA_CONFIG_REG rxdmacfg = {
.b_DMA_EN = 1, /* enabled */
.b_WNR = 1, /* write to memory */
.b_WDSIZE = 2, /* wordsize is 32 bits */
.b_DMA2D = 0,
.b_RESTART = 0,
.b_DI_SEL = 0,
.b_DI_EN = 0, /* no interrupt */
.b_NDSIZE = 5, /* 5 half words is desc size */
.b_FLOW = 7 /* large desc flow */
};
#if 0 const ADI_DMA_CONFIG_REG txdmacfg = {
rxdmacfg.b_DMA_EN = 1; /* enabled */ .b_DMA_EN = 1, /* enabled */
rxdmacfg.b_WNR = 1; /* write to memory */ .b_WNR = 0, /* read from memory */
rxdmacfg.b_WDSIZE = 2; /* wordsize is 32 bits */ .b_WDSIZE = 2, /* wordsize is 32 bits */
rxdmacfg.b_DMA2D = 0; /* N/A */ .b_DMA2D = 0,
rxdmacfg.b_RESTART= 0; /* N/A */ .b_RESTART = 0,
rxdmacfg.b_DI_SEL = 0; /* N/A */ .b_DI_SEL = 0,
rxdmacfg.b_DI_EN = 0; /* no interrupt */ .b_DI_EN = 0, /* no interrupt */
rxdmacfg.b_NDSIZE = 5; /* 5 half words is desc size. */ .b_NDSIZE = 5, /* 5 half words is desc size */
rxdmacfg.b_FLOW = 7; /* large desc flow */ .b_FLOW = 7 /* large desc flow */
#endif };
const ADI_DMA_CONFIG_REG txdmacfg = { 1, 0, 2, 0, 0, 0, 0, 5, 7 };
#if 0
txdmacfg.b_DMA_EN = 1; /* enabled */
txdmacfg.b_WNR = 0; /* read from memory */
txdmacfg.b_WDSIZE = 2; /* wordsize is 32 bits */
txdmacfg.b_DMA2D = 0; /* N/A */
txdmacfg.b_RESTART= 0; /* N/A */
txdmacfg.b_DI_SEL = 0; /* N/A */
txdmacfg.b_DI_EN = 0; /* no interrupt */
txdmacfg.b_NDSIZE = 5; /* 5 half words is desc size. */
txdmacfg.b_FLOW = 7; /* large desc flow */
#endif
ADI_ETHER_BUFFER *SetupRxBuffer(int no);
ADI_ETHER_BUFFER *SetupTxBuffer(int no);
static int bfin_EMAC_init(struct eth_device *dev, bd_t * bd);
static void bfin_EMAC_halt(struct eth_device *dev);
static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet,
int length);
static int bfin_EMAC_recv(struct eth_device *dev);
int bfin_EMAC_initialize(bd_t *bis) int bfin_EMAC_initialize(bd_t *bis)
{ {
@ -108,7 +77,7 @@ int bfin_EMAC_initialize(bd_t * bis)
hang(); hang();
memset(dev, 0, sizeof(*dev)); memset(dev, 0, sizeof(*dev));
sprintf(dev->name, "BF537 ETHERNET"); sprintf(dev->name, "Blackfin EMAC");
dev->iobase = 0; dev->iobase = 0;
dev->priv = 0; dev->priv = 0;
@ -227,7 +196,7 @@ static int bfin_EMAC_init(struct eth_device *dev, bd_t * bd)
return -1; return -1;
/* Initialize EMAC address */ /* Initialize EMAC address */
SetupMacAddr(SrcAddr); bfin_EMAC_setup_addr(bd);
/* Initialize TX and RX buffer */ /* Initialize TX and RX buffer */
for (i = 0; i < PKTBUFSRX; i++) { for (i = 0; i < PKTBUFSRX; i++) {
@ -289,37 +258,25 @@ static void bfin_EMAC_halt(struct eth_device *dev)
} }
void SetupMacAddr(u8 * MACaddr) void bfin_EMAC_setup_addr(bd_t *bd)
{ {
char *tmp, *end; *pEMAC_ADDRLO =
int i; bd->bi_enetaddr[0] |
/* this depends on a little-endian machine */ bd->bi_enetaddr[1] << 8 |
tmp = getenv("ethaddr"); bd->bi_enetaddr[2] << 16 |
if (tmp) { bd->bi_enetaddr[3] << 24;
for (i = 0; i < 6; i++) { *pEMAC_ADDRHI =
MACaddr[i] = tmp ? simple_strtoul(tmp, &end, 16) : 0; bd->bi_enetaddr[4] |
if (tmp) bd->bi_enetaddr[5] << 8;
tmp = (*end) ? end + 1 : end;
} }
#ifndef CONFIG_NETCONSOLE static void PollMdcDone(void)
printf("Using MAC Address %02X:%02X:%02X:%02X:%02X:%02X\n",
MACaddr[0], MACaddr[1],
MACaddr[2], MACaddr[3], MACaddr[4], MACaddr[5]);
#endif
*pEMAC_ADDRLO = MACaddr[0] | MACaddr[1] << 8 |
MACaddr[2] << 16 | MACaddr[3] << 24;
*pEMAC_ADDRHI = MACaddr[4] | MACaddr[5] << 8;
}
}
void PollMdcDone(void)
{ {
/* poll the STABUSY bit */ /* poll the STABUSY bit */
while (*pEMAC_STAADD & STABUSY) ; while (*pEMAC_STAADD & STABUSY) ;
} }
void WrPHYReg(u16 PHYAddr, u16 RegAddr, u16 Data) static void WrPHYReg(u16 PHYAddr, u16 RegAddr, u16 Data)
{ {
PollMdcDone(); PollMdcDone();
@ -332,7 +289,7 @@ void WrPHYReg(u16 PHYAddr, u16 RegAddr, u16 Data)
/********************************************************************************* /*********************************************************************************
* Read an off-chip register in a PHY through the MDC/MDIO port * * Read an off-chip register in a PHY through the MDC/MDIO port *
*********************************************************************************/ *********************************************************************************/
u16 RdPHYReg(u16 PHYAddr, u16 RegAddr) static u16 RdPHYReg(u16 PHYAddr, u16 RegAddr)
{ {
u16 Data; u16 Data;
@ -350,7 +307,8 @@ u16 RdPHYReg(u16 PHYAddr, u16 RegAddr)
return Data; return Data;
} }
void SoftResetPHY(void) #if 0 /* dead code ? */
static void SoftResetPHY(void)
{ {
u16 phydat; u16 phydat;
/* set the reset bit */ /* set the reset bit */
@ -362,13 +320,30 @@ void SoftResetPHY(void)
phydat = RdPHYReg(PHYADDR, PHY_MODECTL); phydat = RdPHYReg(PHYADDR, PHY_MODECTL);
} while ((phydat & PHY_RESET) != 0); } while ((phydat & PHY_RESET) != 0);
} }
#endif
int SetupSystemRegs(int *opmode) static int SetupSystemRegs(int *opmode)
{ {
u16 sysctl, phydat; u16 sysctl, phydat;
int count = 0; int count = 0;
/* Enable PHY output */ /* Enable PHY output */
*pVR_CTL |= CLKBUFOE; *pVR_CTL |= CLKBUFOE;
/* Set all the pins to peripheral mode */
#ifndef CONFIG_BFIN_MAC_RMII
*pPORTH_FER = 0xFFFF;
#ifdef __ADSPBF52x__
*pPORTH_MUX = PORT_x_MUX_0_FUNC_2 | PORT_x_MUX_1_FUNC_2 | PORT_x_MUX_2_FUNC_2;
#endif
#else
#if defined(__ADSPBF536__) || defined(__ADSPBF537__)
*pPORTH_FER = 0xC373;
#endif
#ifdef __ADSPBF52x__
*pPORTH_FER = 0x01FF;
*pPORTH_MUX = PORT_x_MUX_0_FUNC_2 | PORT_x_MUX_1_FUNC_2;
#endif
#endif
/* MDC = 2.5 MHz */ /* MDC = 2.5 MHz */
sysctl = SET_MDCDIV(24); sysctl = SET_MDCDIV(24);
/* Odd word alignment for Receive Frame DMA word */ /* Odd word alignment for Receive Frame DMA word */
@ -546,4 +521,3 @@ int ether_post_test(int flags)
return 0; return 0;
} }
#endif #endif
#endif

32
board/bf537-stamp/ether_bf537.h → drivers/net/bfin_mac.h
View file

@ -1,3 +1,14 @@
/*
* bfin_mac.h - some defines/structures for the Blackfin on-chip MAC.
*
* Copyright (c) 2005-2008 Analog Device, Inc.
*
* Licensed under the GPL-2 or later.
*/
#ifndef __BFIN_MAC_H__
#define __BFIN_MAC_H__
#define PHYADDR 0x01 #define PHYADDR 0x01
#define NO_PHY_REGS 0x20 #define NO_PHY_REGS 0x20
@ -60,12 +71,19 @@ typedef struct adi_ether_buffer {
} ADI_ETHER_BUFFER; } ADI_ETHER_BUFFER;
/* 40 bytes/struct in 44 bytes */ /* 40 bytes/struct in 44 bytes */
void SetupMacAddr(u8 * MACaddr); static ADI_ETHER_BUFFER *SetupRxBuffer(int no);
static ADI_ETHER_BUFFER *SetupTxBuffer(int no);
void PollMdcDone(void); static int bfin_EMAC_init(struct eth_device *dev, bd_t *bd);
void WrPHYReg(u16 PHYAddr, u16 RegAddr, u16 Data); static void bfin_EMAC_halt(struct eth_device *dev);
u16 RdPHYReg(u16 PHYAddr, u16 RegAddr); static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet, int length);
void SoftResetPHY(void); static int bfin_EMAC_recv(struct eth_device *dev);
void DumpPHYRegs(void);
int SetupSystemRegs(int *opmode); static void PollMdcDone(void);
static void WrPHYReg(u16 PHYAddr, u16 RegAddr, u16 Data);
static u16 RdPHYReg(u16 PHYAddr, u16 RegAddr);
static int SetupSystemRegs(int *opmode);
static void bfin_EMAC_setup_addr(bd_t *bd);
#endif