Commit 9a236b54 authored by Luiz Angelo Daros de Luca's avatar Luiz Angelo Daros de Luca Committed by David S. Miller

net: dsa: realtek: realtek-smi: clean-up reset

When reset GPIO was missing, the driver was still printing an info
message and still trying to assert the reset. Although gpiod_set_value()
will silently ignore calls with NULL gpio_desc, it is better to make it
clear the driver might allow gpio_desc to be NULL.

The initial value for the reset pin was changed to GPIOD_OUT_LOW,
followed by a gpiod_set_value() asserting the reset. This way, it will
be easier to spot if and where the reset really happens.

A new "asserted RESET" message was added just after the reset is
asserted, similar to the existing "deasserted RESET" message. Both
messages were demoted to dbg. The code comment is not needed anymore.
Signed-off-by: default avatarLuiz Angelo Daros de Luca <luizluca@gmail.com>
Acked-by: default avatarArınç ÜNAL <arinc.unal@arinc9.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd263a8c
...@@ -420,16 +420,19 @@ static int realtek_smi_probe(struct platform_device *pdev) ...@@ -420,16 +420,19 @@ static int realtek_smi_probe(struct platform_device *pdev)
/* TODO: if power is software controlled, set up any regulators here */ /* TODO: if power is software controlled, set up any regulators here */
/* Assert then deassert RESET */ priv->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
priv->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
if (IS_ERR(priv->reset)) { if (IS_ERR(priv->reset)) {
dev_err(dev, "failed to get RESET GPIO\n"); dev_err(dev, "failed to get RESET GPIO\n");
return PTR_ERR(priv->reset); return PTR_ERR(priv->reset);
} }
msleep(REALTEK_SMI_HW_STOP_DELAY); if (priv->reset) {
gpiod_set_value(priv->reset, 0); gpiod_set_value(priv->reset, 1);
msleep(REALTEK_SMI_HW_START_DELAY); dev_dbg(dev, "asserted RESET\n");
dev_info(dev, "deasserted RESET\n"); msleep(REALTEK_SMI_HW_STOP_DELAY);
gpiod_set_value(priv->reset, 0);
msleep(REALTEK_SMI_HW_START_DELAY);
dev_dbg(dev, "deasserted RESET\n");
}
/* Fetch MDIO pins */ /* Fetch MDIO pins */
priv->mdc = devm_gpiod_get_optional(dev, "mdc", GPIOD_OUT_LOW); priv->mdc = devm_gpiod_get_optional(dev, "mdc", GPIOD_OUT_LOW);
...@@ -474,7 +477,10 @@ static int realtek_smi_remove(struct platform_device *pdev) ...@@ -474,7 +477,10 @@ static int realtek_smi_remove(struct platform_device *pdev)
dsa_unregister_switch(priv->ds); dsa_unregister_switch(priv->ds);
if (priv->slave_mii_bus) if (priv->slave_mii_bus)
of_node_put(priv->slave_mii_bus->dev.of_node); of_node_put(priv->slave_mii_bus->dev.of_node);
gpiod_set_value(priv->reset, 1);
/* leave the device reset asserted */
if (priv->reset)
gpiod_set_value(priv->reset, 1);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
......
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