aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch
blob: 7a29846c25f2a5f1fe9d474dd8ebc7088b113dbe (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Index: linux-4.3/drivers/net/ethernet/marvell/sky2.c
===================================================================
--- linux-4.3.orig/drivers/net/ethernet/marvell/sky2.c	2015-11-01 16:05:25.000000000 -0800
+++ linux-4.3/drivers/net/ethernet/marvell/sky2.c	2015-12-18 10:39:44.983158318 -0800
@@ -4812,7 +4812,24 @@
 	 * 1) from device tree data
 	 * 2) from internal registers set by bootloader
 	 */
-	iap = of_get_mac_address(hw->pdev->dev.of_node);
+
+	iap = NULL;
+	if (IS_ENABLED(CONFIG_OF)) {
+		struct device_node *np;
+		np = of_find_node_by_path("/aliases");
+		if (np) {
+			const char *path = of_get_property(np, "sky2", NULL);
+			if (path)
+				np = of_find_node_by_path(path);
+			if (np)
+				path = of_get_mac_address(np);
+			if (path)
+				iap = (unsigned char *) path;
+		}
+	}
+
+	if (!iap)
+		iap = of_get_mac_address(hw->pdev->dev.of_node);
 	if (iap)
 		memcpy(dev->dev_addr, iap, ETH_ALEN);
 	else