aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJochen Friedrich <jochen@scram.de>2007-12-18 16:25:43 +0100
committerKumar Gala <galak@kernel.crashing.org>2008-01-23 19:54:28 -0600
commit70f782e14870435aa37b91e1ea0a189a78eb0fa9 (patch)
treec691092abb08aa9024ac472a9a65c4b7d90554bf /drivers/net
parent6869e4ad4bd17e7699e58bed6464738e8677c392 (diff)
fs_enet: Add fixed-phy support for fs_enet
This patch adds support to use the fixed-link property of an ethernet node to fs_enet for the CONFIG_PPC_CPM_NEW_BINDING case. Signed-off-by: Jochen Friedrich <jochen@scram.de> Acked-by: Jeff Garzik <jeff@garzik.org> Acked-by: Vitali Bordug <vitb@kernel.crashing.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fs_enet/fs_enet-main.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index f2a4d399a6e..8220c70534e 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1174,8 +1174,15 @@ static int __devinit find_phy(struct device_node *np,
struct device_node *phynode, *mdionode;
struct resource res;
int ret = 0, len;
+ const u32 *data;
+
+ data = of_get_property(np, "fixed-link", NULL);
+ if (data) {
+ snprintf(fpi->bus_id, 16, PHY_ID_FMT, 0, *data);
+ return 0;
+ }
- const u32 *data = of_get_property(np, "phy-handle", &len);
+ data = of_get_property(np, "phy-handle", &len);
if (!data || len != 4)
return -EINVAL;