Hello.

On 2/16/2016 3:13 AM, Sergio Prado wrote:

Signed-off-by: Sergio Prado <sergio.pr...@e-labworks.com>
---
As requested by Rob Herring on patch
https://patchwork.ozlabs.org/patch/580862/
---
  Documentation/devicetree/bindings/net/macb.txt | 2 +-
  drivers/net/ethernet/cadence/macb.c            | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/macb.txt 
b/Documentation/devicetree/bindings/net/macb.txt
index c6b1cb5ffa87..b5a42df4c928 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -25,7 +25,7 @@ Required properties:

  Optional properties for PHY child node:
  - 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.

  Examples:
diff --git a/drivers/net/ethernet/cadence/macb.c 
b/drivers/net/ethernet/cadence/macb.c
index 69af049e55a8..7ccf2298a5fa 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2929,7 +2929,7 @@ static int macb_probe(struct platform_device *pdev)
                bp->jumbo_max_len = macb_config->jumbo_max_len;

        bp->wol = 0;
-       if (of_get_property(np, "cdns,magic-packet", NULL))
+       if (of_get_property(np, "magic-packet", NULL))

   Could as well use of_property_read_bool().

[...]

MBR, Sergei

Reply via email to