From 33d546bdccb78826c55a2413935b23b1150c0cda Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Date: Fri, 16 Nov 2012 00:33:59 +0000
Subject: [PATCH] --- yaml --- r: 335849 b: refs/heads/master c:
 3272dd9b0fe4bc09321219ab65dc5eda3e82445c h: refs/heads/master i:   335847:
 cb14c14373ccbad51216579acb851ff4299fbec2 v: v3

---
 [refs]                                                |  2 +-
 .../devicetree/bindings/net/mdio-gpio.txt             |  9 ++++++++-
 trunk/drivers/net/phy/mdio-gpio.c                     | 11 +++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9ef063f97abd..6a6165d95869 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8495c0da20bc496ac9d5da2b292adb28f61d2713
+refs/heads/master: 3272dd9b0fe4bc09321219ab65dc5eda3e82445c
diff --git a/trunk/Documentation/devicetree/bindings/net/mdio-gpio.txt b/trunk/Documentation/devicetree/bindings/net/mdio-gpio.txt
index bc9549529014..c79bab025369 100644
--- a/trunk/Documentation/devicetree/bindings/net/mdio-gpio.txt
+++ b/trunk/Documentation/devicetree/bindings/net/mdio-gpio.txt
@@ -8,9 +8,16 @@ gpios property as described in section VIII.1 in the following order:
 
 MDC, MDIO.
 
+Note: Each gpio-mdio bus should have an alias correctly numbered in "aliases"
+node.
+
 Example:
 
-mdio {
+aliases {
+	mdio-gpio0 = <&mdio0>;
+};
+
+mdio0: mdio {
 	compatible = "virtual,mdio-gpio";
 	#address-cells = <1>;
 	#size-cells = <0>;
diff --git a/trunk/drivers/net/phy/mdio-gpio.c b/trunk/drivers/net/phy/mdio-gpio.c
index 899274f2f9b1..2ed1140df3e9 100644
--- a/trunk/drivers/net/phy/mdio-gpio.c
+++ b/trunk/drivers/net/phy/mdio-gpio.c
@@ -185,17 +185,20 @@ static int __devinit mdio_gpio_probe(struct platform_device *pdev)
 {
 	struct mdio_gpio_platform_data *pdata;
 	struct mii_bus *new_bus;
-	int ret;
+	int ret, bus_id;
 
-	if (pdev->dev.of_node)
+	if (pdev->dev.of_node) {
 		pdata = mdio_gpio_of_get_data(pdev);
-	else
+		bus_id = of_alias_get_id(pdev->dev.of_node, "mdio-gpio");
+	} else {
 		pdata = pdev->dev.platform_data;
+		bus_id = pdev->id;
+	}
 
 	if (!pdata)
 		return -ENODEV;
 
-	new_bus = mdio_gpio_bus_init(&pdev->dev, pdata, pdev->id);
+	new_bus = mdio_gpio_bus_init(&pdev->dev, pdata, bus_id);
 	if (!new_bus)
 		return -ENODEV;