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>

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 f2a4d399a6e5..8220c70534ed 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;