diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-10-30 23:31:26 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-10-30 23:31:26 +0000 |
| commit | 57e70c1cc295de722f293872f89aedb1d94009b0 (patch) | |
| tree | 37b2e3aba160fb9666c7c38adefecef90b795f68 /target/linux/imx6/patches-3.12/020-marvell-sky2-macdt.patch | |
| parent | 4f7c503fd00e256d051f9f398fff298eabed3967 (diff) | |
| download | master-187ad058-57e70c1cc295de722f293872f89aedb1d94009b0.tar.gz master-187ad058-57e70c1cc295de722f293872f89aedb1d94009b0.tar.bz2 master-187ad058-57e70c1cc295de722f293872f89aedb1d94009b0.zip | |
imx6: update patches
Changes include PCI fixes and various upstream pending patches.
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38624 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6/patches-3.12/020-marvell-sky2-macdt.patch')
| -rw-r--r-- | target/linux/imx6/patches-3.12/020-marvell-sky2-macdt.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/target/linux/imx6/patches-3.12/020-marvell-sky2-macdt.patch b/target/linux/imx6/patches-3.12/020-marvell-sky2-macdt.patch deleted file mode 100644 index 96486b1518..0000000000 --- a/target/linux/imx6/patches-3.12/020-marvell-sky2-macdt.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/drivers/net/ethernet/marvell/sky2.c -+++ b/drivers/net/ethernet/marvell/sky2.c -@@ -44,6 +44,8 @@ - #include <linux/prefetch.h> - #include <linux/debugfs.h> - #include <linux/mii.h> -+#include <linux/of_device.h> -+#include <linux/of_net.h> - - #include <asm/irq.h> - -@@ -4748,6 +4750,7 @@ static struct net_device *sky2_init_netd - { - struct sky2_port *sky2; - struct net_device *dev = alloc_etherdev(sizeof(*sky2)); -+ unsigned char *iap, tmpaddr[ETH_ALEN]; - - if (!dev) - return NULL; -@@ -4802,8 +4805,36 @@ - - dev->features |= dev->hw_features; - -+ /* -+ * Try to get mac address in the following order: -+ * 1) from device tree data -+ * 2) from internal registers set by bootloader -+ */ -+ 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; -+ } -+ } -+ -+ /* -+ * 2) mac registers set by bootloader -+ */ -+ if (!iap || !is_valid_ether_addr(iap)) { -+ memcpy_fromio(&tmpaddr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); -+ iap = &tmpaddr[0]; -+ } -+ - /* read the mac address */ -- memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); -+ memcpy(dev->dev_addr, iap, ETH_ALEN); - - return dev; - } |