From 69d09533aadf0c153d477d50bcdfbeb325c91396 Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Date: Tue, 15 Nov 2011 11:54:15 +0000
Subject: [PATCH] --- yaml --- r: 277545 b: refs/heads/master c:
 64882709ef07f3eae29c7afc5aa8b84d12733a72 h: refs/heads/master i:   277543:
 f0a1db4a8afafc1bb615c695da293d8f48dc5706 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/phy/mdio-bitbang.c | 9 +++++++++
 trunk/drivers/net/phy/mdio-gpio.c    | 1 +
 trunk/include/linux/mdio-bitbang.h   | 2 ++
 trunk/include/linux/mdio-gpio.h      | 2 ++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 252edafdd2cf..d6c8b0adae9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 229a66e3bec97563aa92e25dfe0bc60b0d468619
+refs/heads/master: 64882709ef07f3eae29c7afc5aa8b84d12733a72
diff --git a/trunk/drivers/net/phy/mdio-bitbang.c b/trunk/drivers/net/phy/mdio-bitbang.c
index 65391891d8c4..daec9b05d168 100644
--- a/trunk/drivers/net/phy/mdio-bitbang.c
+++ b/trunk/drivers/net/phy/mdio-bitbang.c
@@ -202,6 +202,14 @@ static int mdiobb_write(struct mii_bus *bus, int phy, int reg, u16 val)
 	return 0;
 }
 
+static int mdiobb_reset(struct mii_bus *bus)
+{
+	struct mdiobb_ctrl *ctrl = bus->priv;
+	if (ctrl->reset)
+		ctrl->reset(bus);
+	return 0;
+}
+
 struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl)
 {
 	struct mii_bus *bus;
@@ -214,6 +222,7 @@ struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl)
 
 	bus->read = mdiobb_read;
 	bus->write = mdiobb_write;
+	bus->reset = mdiobb_reset;
 	bus->priv = ctrl;
 
 	return bus;
diff --git a/trunk/drivers/net/phy/mdio-gpio.c b/trunk/drivers/net/phy/mdio-gpio.c
index 2843c90f712f..89c5a3eccc12 100644
--- a/trunk/drivers/net/phy/mdio-gpio.c
+++ b/trunk/drivers/net/phy/mdio-gpio.c
@@ -95,6 +95,7 @@ static struct mii_bus * __devinit mdio_gpio_bus_init(struct device *dev,
 		goto out;
 
 	bitbang->ctrl.ops = &mdio_gpio_ops;
+	bitbang->ctrl.reset = pdata->reset;
 	bitbang->mdc = pdata->mdc;
 	bitbang->mdio = pdata->mdio;
 
diff --git a/trunk/include/linux/mdio-bitbang.h b/trunk/include/linux/mdio-bitbang.h
index 0fe00cd4c93c..76f52bbbb2f4 100644
--- a/trunk/include/linux/mdio-bitbang.h
+++ b/trunk/include/linux/mdio-bitbang.h
@@ -32,6 +32,8 @@ struct mdiobb_ops {
 
 struct mdiobb_ctrl {
 	const struct mdiobb_ops *ops;
+	/* reset callback */
+	int (*reset)(struct mii_bus *bus);
 };
 
 /* The returned bus is not yet registered with the phy layer. */
diff --git a/trunk/include/linux/mdio-gpio.h b/trunk/include/linux/mdio-gpio.h
index e9d3fdfe41d7..7c9fe3c2be73 100644
--- a/trunk/include/linux/mdio-gpio.h
+++ b/trunk/include/linux/mdio-gpio.h
@@ -20,6 +20,8 @@ struct mdio_gpio_platform_data {
 
 	unsigned int phy_mask;
 	int irqs[PHY_MAX_ADDR];
+	/* reset callback */
+	int (*reset)(struct mii_bus *bus);
 };
 
 #endif /* __LINUX_MDIO_GPIO_H */