Commit 962d8cdc authored by Bernhard Walle's avatar Bernhard Walle Committed by David S. Miller
Browse files

net: fec: Rename "phy-reset-active-low" property 



is actually "active high". Thanks for Troy Kisky for pointing
that out.

Since the patch is in linux-next, this patch is incremental and doesn't
replace the original patch.

Signed-off-by: default avatarBernhard Walle <bernhard@bwalle.de>
Acked-by: default avatarFugang Duan <fugang.duan@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c3e962d

Documentation/devicetree/bindings/net/fsl-fec.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Optional properties: 
  only if property "phy-reset-gpios" is available.  Missing the property

  will have the duration be 1 millisecond.  Numbers greater than 1000 are

  invalid and 1 millisecond will be used instead.

- phy-reset-active-low : If present then the reset sequence using the GPIO

- phy-reset-active-high : If present then the reset sequence using the GPIO

  specified in the "phy-reset-gpios" property is reversed (H=reset state,

  L=operation state).

- phy-supply : regulator that powers the Ethernet PHY.

drivers/net/ethernet/freescale/fec_main.c

+4 −4
Original line number Diff line number Diff line
@@ -3191,7 +3191,7 @@ static int fec_enet_init(struct net_device *ndev) 
static void fec_reset_phy(struct platform_device *pdev)

{

	int err, phy_reset;

	bool active_low = false;

	bool active_high = false;

	int msec = 1;

	struct device_node *np = pdev->dev.of_node;
@@ -3207,17 +3207,17 @@ static void fec_reset_phy(struct platform_device *pdev) 
	if (!gpio_is_valid(phy_reset))

		return;



	active_low = of_property_read_bool(np, "phy-reset-active-low");

	active_high = of_property_read_bool(np, "phy-reset-active-high");



	err = devm_gpio_request_one(&pdev->dev, phy_reset,

			active_low ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,

			active_high ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,

			"phy-reset");

	if (err) {

		dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err);

		return;

	}

	msleep(msec);

	gpio_set_value_cansleep(phy_reset, !active_low);

	gpio_set_value_cansleep(phy_reset, !active_high);

}

#else /* CONFIG_OF */

static void fec_reset_phy(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE