diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-11-29 10:46:41 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-11-29 10:46:42 +0100 |
| commit | 4f5ed7fb6cd65eda3b64503aaecf61d7fb03fcbf (patch) | |
| tree | 6ee34dba450f4bbfbb37ee524a394ee2f2b04747 /include/linux/of_net.h | |
| parent | d6dc62fca6b6a1e75430618bf6d84cf135f1b3d8 (diff) | |
| parent | 7a74c1265ab4340b0fd5223084151003ef4c394a (diff) | |
Merge branch 'marvell-nvmem-mac-addresses-support'
Miquel Raynal says:
====================
Marvell nvmem mac addresses support
Now that we are aligned on how to make information available from static
storage media to drivers like Ethernet controller drivers or switch
drivers by using nvmem cells and going through the whole nvmem
infrastructure, here are two driver updates to reflect these changes.
Prior to the driver updates, I propose:
* Reverting binding changes which should have never been accepted like
that.
* A conversion of the (old) Prestera and DFX server bindings (optional,
can be dropped if not considered necessary).
* A better description of the more recent Prestera PCI switch.
Please mind that this series cannot break anything since retrieving the
MAC address Prestera driver has never worked upstream, because the (ONIE
tlv) driver supposed to export the MAC address has not been accepted in
its original form and has been updated to the nvmem-layout
infrastructure (bindings have been merged, the code remains to be
applied).
====================
Link: https://lore.kernel.org/r/20221124111556.264647-1-miquel.raynal@bootlin.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'include/linux/of_net.h')
| -rw-r--r-- | include/linux/of_net.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/of_net.h b/include/linux/of_net.h index 0484b613ca64..d88715a0b3a5 100644 --- a/include/linux/of_net.h +++ b/include/linux/of_net.h @@ -14,6 +14,7 @@ struct net_device; extern int of_get_phy_mode(struct device_node *np, phy_interface_t *interface); extern int of_get_mac_address(struct device_node *np, u8 *mac); +extern int of_get_mac_address_nvmem(struct device_node *np, u8 *mac); int of_get_ethdev_address(struct device_node *np, struct net_device *dev); extern struct net_device *of_find_net_device_by_node(struct device_node *np); #else @@ -28,6 +29,11 @@ static inline int of_get_mac_address(struct device_node *np, u8 *mac) return -ENODEV; } +static inline int of_get_mac_address_nvmem(struct device_node *np, u8 *mac) +{ + return -ENODEV; +} + static inline int of_get_ethdev_address(struct device_node *np, struct net_device *dev) { return -ENODEV; |