Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c4a1d0c authored by Sergio Prado's avatar Sergio Prado Committed by David S. Miller
Browse files

net: macb: make magic-packet property generic 

As requested by Rob Herring on patch
https://patchwork.ozlabs.org/patch/580862/

.

This is a new property that it's still in net-next and has never been
used in production, so we are not breaking anything with the
incompatible binding change.

Signed-off-by: default avatarSergio Prado <sergio.prado@e-labworks.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef240c10

Documentation/devicetree/bindings/net/macb.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ Required properties: 




Optional properties for PHY child node:

Optional properties for PHY child node:

- reset-gpios : Should specify the gpio for phy reset

- reset-gpios : Should specify the gpio for phy reset

- cdns,magic-packet : If present, indicates that the hardware supports waking

- magic-packet : If present, indicates that the hardware supports waking

  up via magic packet.

  up via magic packet.





Examples:

Examples:

drivers/net/ethernet/cadence/macb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2929,7 +2929,7 @@ static int macb_probe(struct platform_device *pdev) 
		bp->jumbo_max_len = macb_config->jumbo_max_len;

		bp->jumbo_max_len = macb_config->jumbo_max_len;





	bp->wol = 0;

	bp->wol = 0;

	if (of_get_property(np, "cdns,magic-packet", NULL))

	if (of_get_property(np, "magic-packet", NULL))

		bp->wol |= MACB_WOL_HAS_MAGIC_PACKET;

		bp->wol |= MACB_WOL_HAS_MAGIC_PACKET;

	device_init_wakeup(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);

	device_init_wakeup(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);