ar71xx: add revision detection for D-Link DIR-505 A1/A2

[oweals/openwrt.git] / target / linux / generic / patches-4.1 / 681-NET-add-of_get_mac_address_mtd.patch

diff --git a/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch b/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch
index fe3f04ed379a1c7bd7b0b2aed06533372c9e2b5d..688cf6e44a6f38eb69bf6905748b6b592c611ad9 100644 (file)
--- a/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch
+++ b/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch
@@ -23,12 +23,13 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  /**
   * of_get_phy_mode - Get phy mode for given device_node
-@@ -80,3 +81,39 @@ const void *of_get_mac_address(struct de
+@@ -80,3 +81,45 @@ const void *of_get_mac_address(struct de
        return of_get_mac_addr(np, "address");
  }
  EXPORT_SYMBOL(of_get_mac_address);
 +
-+int of_get_mac_address_mtd(struct device_node *np, void *mac)
++#ifdef CONFIG_MTD
++int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
 +{
 +      struct device_node *mtd_np = NULL;
 +      size_t retlen;
@@ -37,6 +38,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      const char *part;
 +      const __be32 *list;
 +      phandle phandle;
++      u32 mac_inc = 0;
 +
 +      list = of_get_property(np, "mtd-mac-address", &size);
 +      if (!list || (size != (2 * sizeof(*list))))
@@ -57,19 +59,30 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      if (IS_ERR(mtd))
 +              return PTR_ERR(mtd);
 +
-+      ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, (u_char *) mac);
++      ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
 +      put_mtd_device(mtd);
 +
++      if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
++              mac[5] += mac_inc;
++
 +      return ret;
 +}
 +EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
++#endif
 --- a/include/linux/of_net.h
 +++ b/include/linux/of_net.h
-@@ -13,6 +13,7 @@
+@@ -13,6 +13,14 @@
  struct net_device;
  extern 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);
++#ifdef CONFIG_MTD
++extern int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac);
++#else
++static inline int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
++{
++      return -ENOENT;
++}
++#endif
  extern struct net_device *of_find_net_device_by_node(struct device_node *np);
  #else
  static inline int of_get_phy_mode(struct device_node *np)