mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
91a52f22a1
In the current state, nvmem cells are only detected on platform device. To quickly fix the problem, we register the affected problematic driver with the of_platform but that is more an hack than a real solution. Backport from net-next the required patch so that nvmem can work also with non-platform devices and rework our current patch. Drop the mediatek and dsa workaround and rework the ath10k patches. Rework every driver that use the of_get_mac_address api. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
42 lines
935 B
Diff
42 lines
935 B
Diff
--- a/drivers/of/of_net.c
|
|
+++ b/drivers/of/of_net.c
|
|
@@ -132,6 +132,30 @@ static void *of_get_mac_address_mtd(stru
|
|
return -EINVAL;
|
|
}
|
|
|
|
+static int of_add_mac_address(struct device_node *np, u8* addr)
|
|
+{
|
|
+ struct property *prop;
|
|
+
|
|
+ prop = of_find_property(np, "mac-address", NULL);
|
|
+ if (prop)
|
|
+ kfree(prop);
|
|
+
|
|
+ prop = kzalloc(sizeof(*prop), GFP_KERNEL);
|
|
+ if (!prop)
|
|
+ return 0;
|
|
+
|
|
+ prop->name = "mac-address";
|
|
+ prop->length = ETH_ALEN;
|
|
+ prop->value = kmemdup(addr, ETH_ALEN, GFP_KERNEL);
|
|
+ if (!prop->value || of_add_property(np, prop))
|
|
+ goto free;
|
|
+
|
|
+ return 0;
|
|
+free:
|
|
+ kfree(prop->value);
|
|
+ kfree(prop);
|
|
+ return -ENOMEM;
|
|
+}
|
|
|
|
/**
|
|
* Search the device tree for the best MAC address to use. 'mac-address' is
|
|
@@ -205,6 +232,7 @@ found:
|
|
if (!of_property_read_u32(np, "mac-address-increment", &mac_inc))
|
|
addr[inc_idx] += mac_inc;
|
|
|
|
+ of_add_mac_address(np, addr);
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(of_get_mac_address);
|