summaryrefslogtreecommitdiffstats
path: root/include/linux/mv643xx_eth.h
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-04-24 01:27:02 +0200
committerDale Farnsworth <dale@farnsworth.org>2008-04-28 21:17:07 -0700
commitfa3959f457109cc7d082b86ea6daae927982815b (patch)
tree0e1f7aae6f3340d915f61e1489615972c629621d /include/linux/mv643xx_eth.h
parente31a94ed371c70855eb30b77c490d6d85dd4da26 (diff)
downloadlinux-fa3959f457109cc7d082b86ea6daae927982815b.tar.gz
linux-fa3959f457109cc7d082b86ea6daae927982815b.tar.bz2
linux-fa3959f457109cc7d082b86ea6daae927982815b.zip
mv643xx_eth: get rid of static variables, allow multiple instances
Move mv643xx_eth's static state (ethernet register block base address and MII management interface spinlock) into a struct hanging off the shared platform device. This is necessary to support chips that contain multiple mv643xx_eth silicon blocks. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Acked-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Diffstat (limited to 'include/linux/mv643xx_eth.h')
-rw-r--r--include/linux/mv643xx_eth.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index 30e11aa3c1c9..2d59855b61c1 100644
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -1,6 +1,7 @@
/*
* MV-643XX ethernet platform device data definition file.
*/
+
#ifndef __LINUX_MV643XX_ETH_H
#define __LINUX_MV643XX_ETH_H
@@ -13,7 +14,9 @@
#define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290
struct mv643xx_eth_platform_data {
+ struct platform_device *shared;
int port_number;
+
u16 force_phy_addr; /* force override if phy_addr == 0 */
u16 phy_addr;