From d57d0bdb899c8c44608710fd774d9484d2aa5260 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@elliptictech.com>
Date: Wed, 7 Nov 2012 06:20:34 +0000
Subject: [PATCH] --- yaml --- r: 340716 b: refs/heads/master c:
 56277f40d73f12d9ffb12b5a6bd7e0ad1f2284b3 h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/Documentation/ABI/testing/sysfs-bus-mdio |  9 +++++++++
 trunk/drivers/net/phy/mdio_bus.c               | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/ABI/testing/sysfs-bus-mdio

diff --git a/[refs] b/[refs]
index 47dc9c6b3462..b9622e9b2352 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1ead1aea1d7e3c260d896943056453717577525
+refs/heads/master: 56277f40d73f12d9ffb12b5a6bd7e0ad1f2284b3
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-mdio b/trunk/Documentation/ABI/testing/sysfs-bus-mdio
new file mode 100644
index 000000000000..6349749ebc29
--- /dev/null
+++ b/trunk/Documentation/ABI/testing/sysfs-bus-mdio
@@ -0,0 +1,9 @@
+What:		/sys/bus/mdio_bus/devices/.../phy_id
+Date:		November 2012
+KernelVersion:	3.8
+Contact:	netdev@vger.kernel.org
+Description:
+		This attribute contains the 32-bit PHY Identifier as reported
+		by the device during bus enumeration, encoded in hexadecimal.
+		This ID is used to match the device with the appropriate
+		driver.
diff --git a/trunk/drivers/net/phy/mdio_bus.c b/trunk/drivers/net/phy/mdio_bus.c
index c1ef3000ea60..044b5326459f 100644
--- a/trunk/drivers/net/phy/mdio_bus.c
+++ b/trunk/drivers/net/phy/mdio_bus.c
@@ -431,10 +431,24 @@ static struct dev_pm_ops mdio_bus_pm_ops = {
 
 #endif /* CONFIG_PM */
 
+static ssize_t
+phy_id_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	struct phy_device *phydev = to_phy_device(dev);
+
+	return sprintf(buf, "0x%.8lx\n", (unsigned long)phydev->phy_id);
+}
+
+static struct device_attribute mdio_dev_attrs[] = {
+	__ATTR_RO(phy_id),
+	__ATTR_NULL
+};
+
 struct bus_type mdio_bus_type = {
 	.name		= "mdio_bus",
 	.match		= mdio_bus_match,
 	.pm		= MDIO_BUS_PM_OPS,
+	.dev_attrs	= mdio_dev_attrs,
 };
 EXPORT_SYMBOL(mdio_bus_type);