summaryrefslogtreecommitdiff
path: root/include/linux/mv643xx_eth.h
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-08-26 14:06:47 +0200
committerLennert Buytenhek <buytenh@marvell.com>2008-09-05 06:33:59 +0200
commitac840605f3b1d9b99e1e6629a54994f8e003ff91 (patch)
treec0d47ef7ca41c4f88baa5e66b07f95ad586c7341 /include/linux/mv643xx_eth.h
parentfc0eb9f226d8ecc8e3b563bf808bd6d61a6153a1 (diff)
mv643xx_eth: remove force_phy_addr field
Currently, there are two different fields in the mv643xx_eth_platform_data struct that together describe the PHY address -- one field (phy_addr) has the address of the PHY, but if that address is zero, a second field (force_phy_addr) needs to be set to distinguish the actual address zero from a zero due to not having filled in the PHY address explicitly (which should mean 'use the default PHY address'). If we are a bit smarter about the encoding of the phy_addr field, we can avoid the need for a second field -- this patch does that. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'include/linux/mv643xx_eth.h')
-rw-r--r--include/linux/mv643xx_eth.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index 12339eb65704..cbbbe9bfecad 100644
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -21,6 +21,10 @@ struct mv643xx_eth_shared_platform_data {
unsigned int t_clk;
};
+#define MV643XX_ETH_PHY_ADDR_DEFAULT 0
+#define MV643XX_ETH_PHY_ADDR(x) (0x80 | (x))
+#define MV643XX_ETH_PHY_NONE 0xff
+
struct mv643xx_eth_platform_data {
/*
* Pointer back to our parent instance, and our port number.
@@ -31,7 +35,6 @@ struct mv643xx_eth_platform_data {
/*
* Whether a PHY is present, and if yes, at which address.
*/
- int force_phy_addr;
int phy_addr;
/*