Index: linux-3.7-rc8/arch/mips/lantiq/xway/Makefile =================================================================== --- linux-3.7-rc8.orig/arch/mips/lantiq/xway/Makefile 2012-12-13 10:59:54.176314899 +0100 +++ linux-3.7-rc8/arch/mips/lantiq/xway/Makefile 2012-12-13 13:58:51.696584083 +0100 @@ -1,3 +1,6 @@ obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o +obj-y += eth_mac.o +obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o + obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o Index: linux-3.7-rc8/arch/mips/lantiq/xway/ath_eep.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-3.7-rc8/arch/mips/lantiq/xway/ath_eep.c 2012-12-13 13:49:12.472569552 +0100 @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2011 John Crispin + * Copyright (C) 2011 Andrej Vlašić + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include + +extern int (*ltq_pci_plat_dev_init)(struct pci_dev *dev); +struct ath5k_platform_data ath5k_pdata; +/*struct ath9k_platform_data ath9k_pdata = { + .led_pin = -1, + .endian_check = true, +};*/ +static u16 ath5k_eeprom_data[ATH5K_PLAT_EEP_MAX_WORDS]; +//static u16 ath9k_eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS]; +static u8 athxk_eeprom_mac[6]; + +/*static int +ath9k_pci_plat_dev_init(struct pci_dev *dev) +{ + dev->dev.platform_data = &ath9k_pdata; + return 0; +} + +void __init +ltq_register_ath9k(u16 *eeprom_data, u8 *macaddr) +{ + memcpy(ath9k_pdata.eeprom_data, eeprom_data, sizeof(ath9k_pdata.eeprom_data)); + ath9k_pdata.macaddr = macaddr; + ltq_pci_plat_dev_init = ath9k_pci_plat_dev_init; +} +*/ +static int ath5k_pci_plat_dev_init(struct pci_dev *dev) +{ + dev->dev.platform_data = &ath5k_pdata; + return 0; +} + +int __init of_ath5k_eeprom_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct resource *eep_res, *mac_res; + void __iomem *eep, *mac; + int mac_offset; + u32 mac_inc = 0; + int i; + + eep_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + + if (!eep_res) { + dev_err(&pdev->dev, "failed to load eeprom address\n"); + return -ENODEV; + } + if (resource_size(eep_res) != ATH5K_PLAT_EEP_MAX_WORDS) { + dev_err(&pdev->dev, "eeprom has an invalid size\n"); + return -EINVAL; + } + + eep = ioremap(eep_res->start, resource_size(eep_res)); + memcpy_fromio(ath5k_eeprom_data, eep, ATH5K_PLAT_EEP_MAX_WORDS); + + if (of_find_property(np, "ath,eep-swap", NULL)) + for (i = 0; i < (ATH5K_PLAT_EEP_MAX_WORDS >> 1); i++) + ath5k_eeprom_data[i] = swab16(ath5k_eeprom_data[i]); + + if (!of_property_read_u32(np, "ath,mac-offset", &mac_offset)) { + memcpy_fromio(athxk_eeprom_mac, (void*) ath5k_eeprom_data, 6); + } else if (mac_res) { + if (resource_size(mac_res) != 6) { + dev_err(&pdev->dev, "mac has an invalid size\n"); + return -EINVAL; + } + mac = ioremap(mac_res->start, resource_size(mac_res)); + memcpy_fromio(athxk_eeprom_mac, mac, 6); + } else { + dev_warn(&pdev->dev, "using random mac\n"); + random_ether_addr(athxk_eeprom_mac); + } + + if (!of_property_read_u32(np, "ath,mac-increment", &mac_inc)) + athxk_eeprom_mac[5] += mac_inc; + + ath5k_pdata.eeprom_data = ath5k_eeprom_data; + ath5k_pdata.macaddr = athxk_eeprom_mac; + ltq_pci_plat_dev_init = ath5k_pci_plat_dev_init; + + dev_info(&pdev->dev, "loaded ath5k eeprom\n"); + + return 0; +} + +static struct of_device_id ath5k_eeprom_ids[] = { + { .compatible = "ath5k,eeprom" }, + { } +}; + +static struct platform_driver ath5k_eeprom_driver = { + .driver = { + .name = "ath5k,eeprom", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(ath5k_eeprom_ids), + }, +}; + +static int __init of_ath5k_eeprom_init(void) +{ + return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe); +} +device_initcall(of_ath5k_eeprom_init); Index: linux-3.7-rc8/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h =================================================================== --- linux-3.7-rc8.orig/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 2012-12-13 10:59:57.300314976 +0100 +++ linux-3.7-rc8/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 2012-12-13 10:59:57.308314977 +0100 @@ -93,5 +93,8 @@ /* allow tapi driver to read the gptu value */ long gptu_get_count(struct clk *clk); +/* allow the ethernet driver to load a flash mapped mac addr */ +const u8* ltq_get_eth_mac(void); + #endif /* CONFIG_SOC_TYPE_XWAY */ #endif /* _LTQ_XWAY_H__ */ Index: linux-3.7-rc8/arch/mips/lantiq/xway/eth_mac.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-3.7-rc8/arch/mips/lantiq/xway/eth_mac.c 2012-12-13 10:59:57.308314977 +0100 @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2012 John Crispin + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include + +static u8 eth_mac[6]; +static int eth_mac_set; + +const u8* ltq_get_eth_mac(void) +{ + return eth_mac; +} + +static int __init setup_ethaddr(char *str) +{ + eth_mac_set = mac_pton(str, eth_mac); + return !eth_mac_set; +} +__setup("ethaddr=", setup_ethaddr); + +int __init of_eth_mac_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct resource *mac_res; + void __iomem *mac; + u32 mac_inc = 0; + + if (eth_mac_set) { + dev_err(&pdev->dev, "mac was already set by bootloader\n"); + return -EINVAL; + } + mac_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + if (!mac_res) { + dev_err(&pdev->dev, "failed to load mac\n"); + return -EINVAL; + } + if (resource_size(mac_res) != 6) { + dev_err(&pdev->dev, "mac has an invalid size\n"); + return -EINVAL; + } + mac = ioremap(mac_res->start, resource_size(mac_res)); + memcpy_fromio(eth_mac, mac, 6); + + if (!of_property_read_u32(np, "mac-increment", &mac_inc)) + eth_mac[5] += mac_inc; + + return 0; +} + +static struct of_device_id eth_mac_ids[] = { + { .compatible = "lantiq,eth-mac" }, + { /* sentinel */ } +}; + +static struct platform_driver eth_mac_driver = { + .driver = { + .name = "lantiq,eth-mac", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(eth_mac_ids), + }, +}; + +static int __init of_eth_mac_init(void) +{ + return platform_driver_probe(ð_mac_driver, of_eth_mac_probe); +} +device_initcall(of_eth_mac_init); Index: linux-3.7-rc8/drivers/net/ethernet/lantiq_etop.c =================================================================== --- linux-3.7-rc8.orig/drivers/net/ethernet/lantiq_etop.c 2012-12-13 10:59:54.176314899 +0100 +++ linux-3.7-rc8/drivers/net/ethernet/lantiq_etop.c 2012-12-13 10:59:57.308314977 +0100 @@ -816,7 +816,8 @@ ltq_etop_change_mtu(dev, 1500); - memcpy(&mac.sa_data, priv->mac, ETH_ALEN); + if (priv->mac) + memcpy(&mac.sa_data, priv->mac, ETH_ALEN); if (!is_valid_ether_addr(mac.sa_data)) { pr_warn("etop: invalid MAC, using random\n"); random_ether_addr(mac.sa_data); @@ -940,7 +941,9 @@ priv->tx_irq = irqres[0].start; priv->rx_irq = irqres[1].start; priv->mii_mode = of_get_phy_mode(pdev->dev.of_node); - priv->mac = of_get_mac_address(pdev->dev.of_node); + priv->mac = ltq_get_eth_mac(); + if (!priv->mac) + priv->mac = of_get_mac_address(pdev->dev.of_node); priv->clk_ppe = clk_get(&pdev->dev, NULL); if (IS_ERR(priv->clk_ppe)) Index: linux-3.7-rc8/arch/mips/lantiq/xway/rt_eep.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-3.7-rc8/arch/mips/lantiq/xway/rt_eep.c 2012-12-13 13:55:43.132579350 +0100 @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2011 John Crispin + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include + +extern int (*ltq_pci_plat_dev_init)(struct pci_dev *dev); +static struct rt2x00_platform_data rt2x00_pdata; + +static int rt2x00_pci_plat_dev_init(struct pci_dev *dev) +{ + dev->dev.platform_data = &rt2x00_pdata; + return 0; +} + +int __init of_ralink_eeprom_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + const char *eeprom; + + if (of_property_read_string(np, "ralink,eeprom", &eeprom)) { + dev_err(&pdev->dev, "failed to load eeprom filename\n"); + return 0; + } + + rt2x00_pdata.eeprom_file_name = kstrdup(eeprom, GFP_KERNEL); +// rt2x00_pdata.mac_address = mac; + ltq_pci_plat_dev_init = rt2x00_pci_plat_dev_init; + + dev_info(&pdev->dev, "using %s as eeprom\n", eeprom); + + return 0; +} + +static struct of_device_id ralink_eeprom_ids[] = { + { .compatible = "ralink,eeprom" }, + { } +}; + +static struct platform_driver ralink_eeprom_driver = { + .driver = { + .name = "ralink,eeprom", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(ralink_eeprom_ids), + }, +}; + +static int __init of_ralink_eeprom_init(void) +{ + return platform_driver_probe(&ralink_eeprom_driver, of_ralink_eeprom_probe); +} +device_initcall(of_ralink_eeprom_init);