Commit 36ad7022 authored by Petr Štetiar's avatar Petr Štetiar Committed by David S. Miller

of_net: Fix residues after of_get_nvmem_mac_address removal

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 9217e566
("of_net: Implement of_get_nvmem_mac_address helper"), but
commit afa64a72 ("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: afa64a72 ("of: net: kill of_get_nvmem_mac_address()")
Signed-off-by: default avatarPetr Štetiar <ynezz@true.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9188d5ca
...@@ -20,6 +20,8 @@ Required properties: ...@@ -20,6 +20,8 @@ Required properties:
Optional properties: Optional properties:
- phy-handle: See ethernet.txt file in the same directory. - phy-handle: See ethernet.txt file in the same directory.
If absent, davinci_emac driver defaults to 100/FULL. 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-rmii-en: 1 byte, 1 means use RMII
- ti,davinci-no-bd-ram: boolean, does EMAC have BD RAM? - ti,davinci-no-bd-ram: boolean, does EMAC have BD RAM?
......
...@@ -10,8 +10,6 @@ Documentation/devicetree/bindings/phy/phy-bindings.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 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" the device by the boot program is different from the "local-mac-address"
property; 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-speed: number, specifies maximum speed in Mbit/s supported by the device;
- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than - max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than
the maximum frame size (there's contradiction in the Devicetree the maximum frame size (there's contradiction in the Devicetree
......
...@@ -26,6 +26,10 @@ Required properties: ...@@ -26,6 +26,10 @@ Required properties:
Optional elements: 'tsu_clk' Optional elements: 'tsu_clk'
- clocks: Phandles to input clocks. - 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: Optional properties for PHY child node:
- reset-gpios : Should specify the gpio for phy reset - reset-gpios : Should specify the gpio for phy reset
- magic-packet : If present, indicates that the hardware supports waking - magic-packet : If present, indicates that the hardware supports waking
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
*/ */
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/nvmem-consumer.h>
#include <linux/of_net.h> #include <linux/of_net.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/export.h> #include <linux/export.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment