Commit c535293f authored by David S. Miller's avatar David S. Miller

Merge branch 'dsa-ksz-Add-reset-GPIO-handling'

Marek Vasut says:

====================
net: dsa: ksz: Add reset GPIO handling

Add code to handle optional reset GPIO in the KSZ switch driver and a
matching DT property adjustments.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4e6feb7a 924352c3
...@@ -8,6 +8,10 @@ Required properties: ...@@ -8,6 +8,10 @@ Required properties:
- "microchip,ksz9477" - "microchip,ksz9477"
- "microchip,ksz9897" - "microchip,ksz9897"
Optional properties:
- reset-gpios : Should be a gpio specifier for a reset line
See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of additional See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of additional
required and optional properties. required and optional properties.
......
...@@ -8,12 +8,14 @@ ...@@ -8,12 +8,14 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/gpio/consumer.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/microchip-ksz.h> #include <linux/platform_data/microchip-ksz.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <linux/of_gpio.h>
#include <linux/of_net.h> #include <linux/of_net.h>
#include <net/dsa.h> #include <net/dsa.h>
#include <net/switchdev.h> #include <net/switchdev.h>
...@@ -294,6 +296,17 @@ int ksz_switch_register(struct ksz_device *dev, ...@@ -294,6 +296,17 @@ int ksz_switch_register(struct ksz_device *dev,
if (dev->pdata) if (dev->pdata)
dev->chip_id = dev->pdata->chip_id; dev->chip_id = dev->pdata->chip_id;
dev->reset_gpio = devm_gpiod_get_optional(dev->dev, "reset",
GPIOD_OUT_LOW);
if (IS_ERR(dev->reset_gpio))
return PTR_ERR(dev->reset_gpio);
if (dev->reset_gpio) {
gpiod_set_value(dev->reset_gpio, 1);
mdelay(10);
gpiod_set_value(dev->reset_gpio, 0);
}
mutex_init(&dev->reg_mutex); mutex_init(&dev->reg_mutex);
mutex_init(&dev->stats_mutex); mutex_init(&dev->stats_mutex);
mutex_init(&dev->alu_mutex); mutex_init(&dev->alu_mutex);
...@@ -329,6 +342,10 @@ void ksz_switch_remove(struct ksz_device *dev) ...@@ -329,6 +342,10 @@ void ksz_switch_remove(struct ksz_device *dev)
{ {
dev->dev_ops->exit(dev); dev->dev_ops->exit(dev);
dsa_unregister_switch(dev->ds); dsa_unregister_switch(dev->ds);
if (dev->reset_gpio)
gpiod_set_value(dev->reset_gpio, 1);
} }
EXPORT_SYMBOL(ksz_switch_remove); EXPORT_SYMBOL(ksz_switch_remove);
......
...@@ -59,6 +59,8 @@ struct ksz_device { ...@@ -59,6 +59,8 @@ struct ksz_device {
void *priv; void *priv;
struct gpio_desc *reset_gpio; /* Optional reset GPIO */
/* chip specific data */ /* chip specific data */
u32 chip_id; u32 chip_id;
int num_vlans; int num_vlans;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment