Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-next

Browse source
This commit is contained in:
Jeff Garzik 2008-06-17 23:24:19 -04:00 committed by Jeff Garzik
commit ebaac8c9a5
3 changed files with 2117 additions and 2877 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
MAINTAINERS
View file

@ -2690,12 +2690,10 @@ L: libertas-dev@lists.infradead.org
S: Maintained S: Maintained
MARVELL MV643XX ETHERNET DRIVER MARVELL MV643XX ETHERNET DRIVER
P: Dale Farnsworth P: Lennert Buytenhek
M: dale@farnsworth.org M: buytenh@marvell.com
P: Manish Lachwani
M: mlachwani@mvista.com
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Odd Fixes for 2.4; Maintained for 2.6. S: Supported
MATROX FRAMEBUFFER DRIVER MATROX FRAMEBUFFER DRIVER
P: Petr Vandrovec P: Petr Vandrovec

4925
drivers/net/mv643xx_eth.c
View file

File diff suppressed because it is too large Load diff

61
include/linux/mv643xx_eth.h
View file

@ -17,30 +17,59 @@
struct mv643xx_eth_shared_platform_data { struct mv643xx_eth_shared_platform_data {
struct mbus_dram_target_info *dram; struct mbus_dram_target_info *dram;
unsigned int t_clk; unsigned int t_clk;
}; };
struct mv643xx_eth_platform_data { struct mv643xx_eth_platform_data {
/*
* Pointer back to our parent instance, and our port number.
*/
struct platform_device *shared; struct platform_device *shared;
int port_number; int port_number;
/*
* Whether a PHY is present, and if yes, at which address.
*/
struct platform_device *shared_smi; struct platform_device *shared_smi;
int force_phy_addr;
int phy_addr;
u16 force_phy_addr; /* force override if phy_addr == 0 */ /*
u16 phy_addr; * Use this MAC address if it is valid, overriding the
* address that is already in the hardware.
*/
u8 mac_addr[6];
/* If speed is 0, then speed and duplex are autonegotiated. */ /*
int speed; /* 0, SPEED_10, SPEED_100, SPEED_1000 */ * If speed is 0, autonegotiation is enabled.
int duplex; /* DUPLEX_HALF or DUPLEX_FULL */ * Valid values for speed: 0, SPEED_10, SPEED_100, SPEED_1000.
* Valid values for duplex: DUPLEX_HALF, DUPLEX_FULL.
*/
int speed;
int duplex;
/* non-zero values of the following fields override defaults */ /*
u32 tx_queue_size; * Which RX/TX queues to use.
u32 rx_queue_size; */
u32 tx_sram_addr; int rx_queue_mask;
u32 tx_sram_size; int tx_queue_mask;
u32 rx_sram_addr;
u32 rx_sram_size; /*
u8 mac_addr[6]; /* mac address if non-zero*/ * Override default RX/TX queue sizes if nonzero.
*/
int rx_queue_size;
int tx_queue_size;
/*
* Use on-chip SRAM for RX/TX descriptors if size is nonzero
* and sufficient to contain all descriptors for the requested
* ring sizes.
*/
unsigned long rx_sram_addr;
int rx_sram_size;
unsigned long tx_sram_addr;
int tx_sram_size;
}; };
#endif /* __LINUX_MV643XX_ETH_H */
#endif