Commit 1e997d04 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-realtek-next' 



Luiz Angelo Daros de Luca says:

====================
net: dsa: realtek: realtek-mdio: reset before setup

This patch series cleans the realtek-smi reset code and copy that to the
realtek-mdio.

v1-v2)
- do not run reset code block if GPIO is missing. It was printing "RESET
  deasserted" even when there is no GPIO configured.
- reset switch after dsa_unregister_switch()
- demote reset messages to debug

v2-v3)
- do not assert the reset on gpiod_get. Do it explicitly aferwards.
- split the commit into two (one for each module)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dd263a8c 05f7b042

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

+19 −0
Original line number Diff line number Diff line
@@ -152,6 +152,21 @@ static int realtek_mdio_probe(struct mdio_device *mdiodev) 
	/* TODO: if power is software controlled, set up any regulators here */

	priv->leds_disabled = of_property_read_bool(np, "realtek,disable-leds");



	priv->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);

	if (IS_ERR(priv->reset)) {

		dev_err(dev, "failed to get RESET GPIO\n");

		return PTR_ERR(priv->reset);

	}



	if (priv->reset) {

		gpiod_set_value(priv->reset, 1);

		dev_dbg(dev, "asserted RESET\n");

		msleep(REALTEK_HW_STOP_DELAY);

		gpiod_set_value(priv->reset, 0);

		msleep(REALTEK_HW_START_DELAY);

		dev_dbg(dev, "deasserted RESET\n");

	}



	ret = priv->ops->detect(priv);

	if (ret) {

		dev_err(dev, "unable to detect switch\n");
@@ -185,6 +200,10 @@ static void realtek_mdio_remove(struct mdio_device *mdiodev) 


	dsa_unregister_switch(priv->ds);



	/* leave the device reset asserted */

	if (priv->reset)

		gpiod_set_value(priv->reset, 1);



	dev_set_drvdata(&mdiodev->dev, NULL);

}

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

+13 −9
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ 
#include "realtek.h"



#define REALTEK_SMI_ACK_RETRY_COUNT		5

#define REALTEK_SMI_HW_STOP_DELAY		25	/* msecs */

#define REALTEK_SMI_HW_START_DELAY		100	/* msecs */



static inline void realtek_smi_clk_delay(struct realtek_priv *priv)

{
@@ -420,16 +418,19 @@ static int realtek_smi_probe(struct platform_device *pdev) 


	/* 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_HIGH);

	priv->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);

	if (IS_ERR(priv->reset)) {

		dev_err(dev, "failed to get RESET GPIO\n");

		return PTR_ERR(priv->reset);

	}

	msleep(REALTEK_SMI_HW_STOP_DELAY);

	if (priv->reset) {

		gpiod_set_value(priv->reset, 1);

		dev_dbg(dev, "asserted RESET\n");

		msleep(REALTEK_HW_STOP_DELAY);

		gpiod_set_value(priv->reset, 0);

	msleep(REALTEK_SMI_HW_START_DELAY);

	dev_info(dev, "deasserted RESET\n");

		msleep(REALTEK_HW_START_DELAY);

		dev_dbg(dev, "deasserted RESET\n");

	}



	/* Fetch MDIO pins */

	priv->mdc = devm_gpiod_get_optional(dev, "mdc", GPIOD_OUT_LOW);
@@ -474,6 +475,9 @@ static int realtek_smi_remove(struct platform_device *pdev) 
	dsa_unregister_switch(priv->ds);

	if (priv->slave_mii_bus)

		of_node_put(priv->slave_mii_bus->dev.of_node);



	/* leave the device reset asserted */

	if (priv->reset)

		gpiod_set_value(priv->reset, 1);



	platform_set_drvdata(pdev, NULL);

drivers/net/dsa/realtek/realtek.h

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
#include <linux/gpio/consumer.h>

#include <net/dsa.h>



#define REALTEK_HW_STOP_DELAY		25	/* msecs */

#define REALTEK_HW_START_DELAY		100	/* msecs */



struct realtek_ops;

struct dentry;

struct inode;