Skip to content

Commit 05f7b04

Browse files
luizlucadavem330
authored andcommitted
net: dsa: realtek: realtek-mdio: reset before setup
Some devices, like the switch in Banana Pi BPI R64 only starts to answer after a HW reset. It is the same reset code from realtek-smi. Reported-by: Frank Wunderlich <[email protected]> Signed-off-by: Luiz Angelo Daros de Luca <[email protected]> Tested-by: Frank Wunderlich <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Reviewed-by: Alvin Šipraga <[email protected]> Acked-by: Arınç ÜNAL <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9a236b5 commit 05f7b04

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

drivers/net/dsa/realtek/realtek-mdio.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,21 @@ static int realtek_mdio_probe(struct mdio_device *mdiodev)
152152
/* TODO: if power is software controlled, set up any regulators here */
153153
priv->leds_disabled = of_property_read_bool(np, "realtek,disable-leds");
154154

155+
priv->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
156+
if (IS_ERR(priv->reset)) {
157+
dev_err(dev, "failed to get RESET GPIO\n");
158+
return PTR_ERR(priv->reset);
159+
}
160+
161+
if (priv->reset) {
162+
gpiod_set_value(priv->reset, 1);
163+
dev_dbg(dev, "asserted RESET\n");
164+
msleep(REALTEK_HW_STOP_DELAY);
165+
gpiod_set_value(priv->reset, 0);
166+
msleep(REALTEK_HW_START_DELAY);
167+
dev_dbg(dev, "deasserted RESET\n");
168+
}
169+
155170
ret = priv->ops->detect(priv);
156171
if (ret) {
157172
dev_err(dev, "unable to detect switch\n");
@@ -185,6 +200,10 @@ static void realtek_mdio_remove(struct mdio_device *mdiodev)
185200

186201
dsa_unregister_switch(priv->ds);
187202

203+
/* leave the device reset asserted */
204+
if (priv->reset)
205+
gpiod_set_value(priv->reset, 1);
206+
188207
dev_set_drvdata(&mdiodev->dev, NULL);
189208
}
190209

drivers/net/dsa/realtek/realtek-smi.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
#include "realtek.h"
4444

4545
#define REALTEK_SMI_ACK_RETRY_COUNT 5
46-
#define REALTEK_SMI_HW_STOP_DELAY 25 /* msecs */
47-
#define REALTEK_SMI_HW_START_DELAY 100 /* msecs */
4846

4947
static inline void realtek_smi_clk_delay(struct realtek_priv *priv)
5048
{
@@ -428,9 +426,9 @@ static int realtek_smi_probe(struct platform_device *pdev)
428426
if (priv->reset) {
429427
gpiod_set_value(priv->reset, 1);
430428
dev_dbg(dev, "asserted RESET\n");
431-
msleep(REALTEK_SMI_HW_STOP_DELAY);
429+
msleep(REALTEK_HW_STOP_DELAY);
432430
gpiod_set_value(priv->reset, 0);
433-
msleep(REALTEK_SMI_HW_START_DELAY);
431+
msleep(REALTEK_HW_START_DELAY);
434432
dev_dbg(dev, "deasserted RESET\n");
435433
}
436434

drivers/net/dsa/realtek/realtek.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
#include <linux/gpio/consumer.h>
1414
#include <net/dsa.h>
1515

16+
#define REALTEK_HW_STOP_DELAY 25 /* msecs */
17+
#define REALTEK_HW_START_DELAY 100 /* msecs */
18+
1619
struct realtek_ops;
1720
struct dentry;
1821
struct inode;

0 commit comments

Comments
 (0)