* [PATCH] of_net: Fix residues after of_get_nvmem_mac_address removal
@ 2019-04-17 20:09 Petr Štetiar
2019-04-19 18:58 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Petr Štetiar @ 2019-04-17 20:09 UTC (permalink / raw)
To: netdev, devicetree
Cc: David S. Miller, Rob Herring, Mark Rutland, Andrew Lunn,
Florian Fainelli, Heiner Kallweit, Frank Rowand,
Petr Štetiar, Bartosz Golaszewski
I've discovered following discrepancy in the bindings/net/ethernet.txt
documentation, where it states following:
- nvmem-cells: phandle, reference to an nvmem node for the MAC address;
- nvmem-cell-names: string, should be "mac-address" if nvmem is to be..
which is actually misleading and confusing. There are only two ethernet
drivers in the tree, cadence/macb and davinci which supports this
properties.
This nvmem-cell* properties were introduced in commit 9217e566bdee
("of_net: Implement of_get_nvmem_mac_address helper"), but
commit afa64a72b862 ("of: net: kill of_get_nvmem_mac_address()")
forget to properly clean up this parts.
So this patch fixes the documentation by moving the nvmem-cell*
properties at the appropriate places. While at it, I've removed unused
include as well.
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Fixes: afa64a72b862 ("of: net: kill of_get_nvmem_mac_address()")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
Documentation/devicetree/bindings/net/davinci_emac.txt | 2 ++
Documentation/devicetree/bindings/net/ethernet.txt | 2 --
Documentation/devicetree/bindings/net/macb.txt | 4 ++++
drivers/of/of_net.c | 1 -
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/davinci_emac.txt b/Documentation/devicetree/bindings/net/davinci_emac.txt
index 24c5cda..ca83dcc 100644
--- a/Documentation/devicetree/bindings/net/davinci_emac.txt
+++ b/Documentation/devicetree/bindings/net/davinci_emac.txt
@@ -20,6 +20,8 @@ Required properties:
Optional properties:
- phy-handle: See ethernet.txt file in the same directory.
If absent, davinci_emac driver defaults to 100/FULL.
+- nvmem-cells: phandle, reference to an nvmem node for the MAC address
+- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used
- ti,davinci-rmii-en: 1 byte, 1 means use RMII
- ti,davinci-no-bd-ram: boolean, does EMAC have BD RAM?
diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt
index cfc376b..2974e63 100644
--- a/Documentation/devicetree/bindings/net/ethernet.txt
+++ b/Documentation/devicetree/bindings/net/ethernet.txt
@@ -10,8 +10,6 @@ Documentation/devicetree/bindings/phy/phy-bindings.txt.
the boot program; should be used in cases where the MAC address assigned to
the device by the boot program is different from the "local-mac-address"
property;
-- nvmem-cells: phandle, reference to an nvmem node for the MAC address;
-- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used;
- max-speed: number, specifies maximum speed in Mbit/s supported by the device;
- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than
the maximum frame size (there's contradiction in the Devicetree
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index 174f292..8b80515 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -26,6 +26,10 @@ Required properties:
Optional elements: 'tsu_clk'
- clocks: Phandles to input clocks.
+Optional properties:
+- nvmem-cells: phandle, reference to an nvmem node for the MAC address
+- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used
+
Optional properties for PHY child node:
- reset-gpios : Should specify the gpio for phy reset
- magic-packet : If present, indicates that the hardware supports waking
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
index 810ab0f..d820f3e 100644
--- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c
@@ -7,7 +7,6 @@
*/
#include <linux/etherdevice.h>
#include <linux/kernel.h>
-#include <linux/nvmem-consumer.h>
#include <linux/of_net.h>
#include <linux/phy.h>
#include <linux/export.h>
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] of_net: Fix residues after of_get_nvmem_mac_address removal
2019-04-17 20:09 [PATCH] of_net: Fix residues after of_get_nvmem_mac_address removal Petr Štetiar
@ 2019-04-19 18:58 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-04-19 18:58 UTC (permalink / raw)
To: ynezz
Cc: netdev, devicetree, robh+dt, mark.rutland, andrew, f.fainelli,
hkallweit1, frowand.list, bgolaszewski
From: Petr Štetiar <ynezz@true.cz>
Date: Wed, 17 Apr 2019 22:09:12 +0200
> I've discovered following discrepancy in the bindings/net/ethernet.txt
> documentation, where it states following:
>
> - nvmem-cells: phandle, reference to an nvmem node for the MAC address;
> - nvmem-cell-names: string, should be "mac-address" if nvmem is to be..
>
> which is actually misleading and confusing. There are only two ethernet
> drivers in the tree, cadence/macb and davinci which supports this
> properties.
>
> This nvmem-cell* properties were introduced in commit 9217e566bdee
> ("of_net: Implement of_get_nvmem_mac_address helper"), but
> commit afa64a72b862 ("of: net: kill of_get_nvmem_mac_address()")
> forget to properly clean up this parts.
>
> So this patch fixes the documentation by moving the nvmem-cell*
> properties at the appropriate places. While at it, I've removed unused
> include as well.
>
> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> Fixes: afa64a72b862 ("of: net: kill of_get_nvmem_mac_address()")
> Signed-off-by: Petr Štetiar <ynezz@true.cz>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-19 18:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-17 20:09 [PATCH] of_net: Fix residues after of_get_nvmem_mac_address removal Petr Štetiar
2019-04-19 18:58 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.