9e5b0cc19c
Sync the patches with those sent upstream for v3.12. Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 37778
76 lines
2.1 KiB
Diff
76 lines
2.1 KiB
Diff
From 2a41724b2d0af9b4444572c4302570a3af377715 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Sun, 14 Jul 2013 23:26:15 +0200
|
|
Subject: [PATCH 15/33] NET: add of_get_mac_address_mtd()
|
|
|
|
Many embedded devices have information such as mac addresses stored inside mtd
|
|
devices. This patch allows us to add a property inside a node describing a
|
|
network interface. The new property points at a mtd partition with an offset
|
|
where the mac address can be found.
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
drivers/of/of_net.c | 37 +++++++++++++++++++++++++++++++++++++
|
|
include/linux/of_net.h | 1 +
|
|
2 files changed, 38 insertions(+)
|
|
|
|
--- a/drivers/of/of_net.c
|
|
+++ b/drivers/of/of_net.c
|
|
@@ -10,6 +10,7 @@
|
|
#include <linux/of_net.h>
|
|
#include <linux/phy.h>
|
|
#include <linux/export.h>
|
|
+#include <linux/mtd/mtd.h>
|
|
|
|
/**
|
|
* It maps 'enum phy_interface_t' found in include/linux/phy.h
|
|
@@ -92,3 +93,39 @@ const void *of_get_mac_address(struct de
|
|
return NULL;
|
|
}
|
|
EXPORT_SYMBOL(of_get_mac_address);
|
|
+
|
|
+int of_get_mac_address_mtd(struct device_node *np, void *mac)
|
|
+{
|
|
+ struct device_node *mtd_np = NULL;
|
|
+ size_t retlen;
|
|
+ int size, ret;
|
|
+ struct mtd_info *mtd;
|
|
+ const char *part;
|
|
+ const __be32 *list;
|
|
+ phandle phandle;
|
|
+
|
|
+ list = of_get_property(np, "mtd-mac-address", &size);
|
|
+ if (!list || (size != (2 * sizeof(*list))))
|
|
+ return -ENOENT;
|
|
+
|
|
+ phandle = be32_to_cpup(list++);
|
|
+ if (phandle)
|
|
+ mtd_np = of_find_node_by_phandle(phandle);
|
|
+
|
|
+ if (!mtd_np)
|
|
+ return -ENOENT;
|
|
+
|
|
+ part = of_get_property(mtd_np, "label", NULL);
|
|
+ if (!part)
|
|
+ part = mtd_np->name;
|
|
+
|
|
+ mtd = get_mtd_device_nm(part);
|
|
+ if (IS_ERR(mtd))
|
|
+ return PTR_ERR(mtd);
|
|
+
|
|
+ ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, (u_char *) mac);
|
|
+ put_mtd_device(mtd);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
|
|
--- a/include/linux/of_net.h
|
|
+++ b/include/linux/of_net.h
|
|
@@ -11,6 +11,7 @@
|
|
#include <linux/of.h>
|
|
extern const int of_get_phy_mode(struct device_node *np);
|
|
extern const void *of_get_mac_address(struct device_node *np);
|
|
+extern int of_get_mac_address_mtd(struct device_node *np, void *mac);
|
|
#else
|
|
static inline const int of_get_phy_mode(struct device_node *np)
|
|
{
|