diff options
| author | Luka Perkov <luka@openwrt.org> | 2016-01-18 06:43:48 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2016-01-18 06:43:48 +0000 |
| commit | c4de2dfd2d79021626acdbaefc6cc9c17eac35bf (patch) | |
| tree | 7c66af2dac9f181d8e9c431ab9f73066de075f24 /target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch | |
| parent | 85bdde7cf2821655c74fb4381926335a1161f0c1 (diff) | |
| download | upstream-c4de2dfd2d79021626acdbaefc6cc9c17eac35bf.tar.gz upstream-c4de2dfd2d79021626acdbaefc6cc9c17eac35bf.tar.bz2 upstream-c4de2dfd2d79021626acdbaefc6cc9c17eac35bf.zip | |
imx6: drop 4.3 support
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 48299
Diffstat (limited to 'target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch')
| -rw-r--r-- | target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch b/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch deleted file mode 100644 index 9a94212235..0000000000 --- a/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/drivers/net/ethernet/marvell/sky2.c -+++ b/drivers/net/ethernet/marvell/sky2.c -@@ -4812,7 +4812,24 @@ static struct net_device *sky2_init_netd - * 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 |