diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-02-01 10:18:11 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-05-02 15:17:30 +0200 |
| commit | 60081f9a0072c2a5caecea617e84a9d2001f7f07 (patch) | |
| tree | 824a3e907af76c5e1ed451525be23c6389627979 /target/linux/imx6/patches-4.4/208-sky2-allow-mac-to-come-from-dt.patch | |
| parent | 491abe8c998381983caa3e411bcef5117e5cfbbb (diff) | |
| download | upstream-60081f9a0072c2a5caecea617e84a9d2001f7f07.tar.gz upstream-60081f9a0072c2a5caecea617e84a9d2001f7f07.tar.bz2 upstream-60081f9a0072c2a5caecea617e84a9d2001f7f07.zip | |
imx6: remove linux 4.4 support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/imx6/patches-4.4/208-sky2-allow-mac-to-come-from-dt.patch')
| -rw-r--r-- | target/linux/imx6/patches-4.4/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.4/208-sky2-allow-mac-to-come-from-dt.patch b/target/linux/imx6/patches-4.4/208-sky2-allow-mac-to-come-from-dt.patch deleted file mode 100644 index 9a94212235..0000000000 --- a/target/linux/imx6/patches-4.4/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 |