Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1334883 > unrolled thread

[PATCH net-next] net: macb: make magic-packet property generic

Started bySergio Prado <sergio.prado@e-labworks.com>
First post2016-02-16 01:20 +0100
Last post2016-02-16 15:30 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH net-next] net: macb: make magic-packet property generic Sergio Prado <sergio.prado@e-labworks.com> - 2016-02-16 01:20 +0100
    Re: [PATCH net-next] net: macb: make magic-packet property generic Arnd Bergmann <arnd@arndb.de> - 2016-02-16 10:20 +0100
    Re: [PATCH net-next] net: macb: make magic-packet property generic Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-02-16 15:30 +0100

#1334883 — [PATCH net-next] net: macb: make magic-packet property generic

FromSergio Prado <sergio.prado@e-labworks.com>
Date2016-02-16 01:20 +0100
Subject[PATCH net-next] net: macb: make magic-packet property generic
Message-ID<r2BwZ-8q7-3@gated-at.bofh.it>
Signed-off-by: Sergio Prado <sergio.prado@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))
 		bp->wol |= MACB_WOL_HAS_MAGIC_PACKET;
 	device_init_wakeup(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);
 
-- 
1.9.1

[toc] | [next] | [standalone]


#1335193

FromArnd Bergmann <arnd@arndb.de>
Date2016-02-16 10:20 +0100
Message-ID<r2JXz-5TU-5@gated-at.bofh.it>
In reply to#1334883
On Monday 15 February 2016 22:13:58 Sergio Prado wrote:
> Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
> ---
> As requested by Rob Herring on patch
> https://patchwork.ozlabs.org/patch/580862/
> 

This needs a changelog comment, at least clarify that the existing
value has never been used in production, so we are not breaking
anything with the incompatible binding  change.

	Arnd

[toc] | [prev] | [next] | [standalone]


#1335455

FromSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date2016-02-16 15:30 +0100
Message-ID<r2ONz-yV-9@gated-at.bofh.it>
In reply to#1334883
Hello.

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

> Signed-off-by: Sergio Prado <sergio.prado@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

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web