The patch titled
powerpc: add fixed-phy support for fs_enet
has been added to the -mm tree. Its filename is
powerpc-add-fixed-phy-support-for-fs_enet.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: powerpc: add fixed-phy support for fs_enet
From: Jochen Friedrich <jochen@xxxxxxxx>
Add 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@xxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/fs_enet/fs_enet-main.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff -puN drivers/net/fs_enet/fs_enet-main.c~powerpc-add-fixed-phy-support-for-fs_enet drivers/net/fs_enet/fs_enet-main.c
--- a/drivers/net/fs_enet/fs_enet-main.c~powerpc-add-fixed-phy-support-for-fs_enet
+++ a/drivers/net/fs_enet/fs_enet-main.c
@@ -1174,8 +1174,15 @@ static int __devinit find_phy(struct dev
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;
_
Patches currently in -mm which might be from jochen@xxxxxxxx are
origin.patch
powerpc-add-support-for-porta-and-portb-odr-registers.patch
powerpc-add-fixed-phy-support-for-fs_enet.patch
dio-fix-kernel-doc-notation.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
