The device tree binding now allows a gpio to be specified which is
attached to the switch chips reset line. If it is defined, perform
a hardware reset on the switch during setup.

Signed-off-by: Andrew Lunn <and...@lunn.ch>
---
 drivers/net/dsa/mv88e6xxx.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index b06dba05594a..c0bbbe7713c5 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -19,6 +19,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
+#include <linux/gpio/consumer.h>
 #include <linux/phy.h>
 #include <net/dsa.h>
 #include <net/switchdev.h>
@@ -2323,7 +2324,10 @@ int mv88e6xxx_switch_reset(struct dsa_switch *ds, bool 
ppu_active)
 {
        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
        u16 is_reset = (ppu_active ? 0x8800 : 0xc800);
+       int gpio = ds->pd->reset;
+       int flags = ds->pd->reset_flags;
        unsigned long timeout;
+       int on = 1;
        int ret;
        int i;
 
@@ -2336,6 +2340,16 @@ int mv88e6xxx_switch_reset(struct dsa_switch *ds, bool 
ppu_active)
        /* Wait for transmit queues to drain. */
        usleep_range(2000, 4000);
 
+       /* If there is a gpio connected to the reset pin, toggle it */
+       if (gpio_is_valid(gpio)) {
+               if (flags && OF_GPIO_ACTIVE_LOW)
+                       on = !on;
+               gpio_set_value_cansleep(gpio, on);
+               usleep_range(10000, 20000);
+               gpio_set_value_cansleep(gpio, !on);
+               usleep_range(10000, 20000);
+       }
+
        /* Reset the switch. Keep the PPU active if requested. The PPU
         * needs to be active to support indirect phy register access
         * through global registers 0x18 and 0x19.
-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to