From cc9eee882ec9e2373bfe7783235cffd53a50c7e2 Mon Sep 17 00:00:00 2001 From: Portisch Date: Mon, 3 Jun 2019 12:17:14 +0000 Subject: [PATCH] Revert "ODROID-COMMON: net/ethernet: MAC address from eFuse memory" This reverts commit a79ad488a83fb5ece786cd0312963108ae0836ba. --- drivers/amlogic/efuse/efuse64.c | 13 ------------- .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 7 ------- 2 files changed, 20 deletions(-) diff --git a/drivers/amlogic/efuse/efuse64.c b/drivers/amlogic/efuse/efuse64.c index e9b524ef57a7..ed4e2f9414f8 100644 --- a/drivers/amlogic/efuse/efuse64.c +++ b/drivers/amlogic/efuse/efuse64.c @@ -229,19 +229,6 @@ static int odroid_provision(struct odroid_efuse_t *fuse) return 0; } - -#include - -void odroid_get_ether_addr(unsigned char *addr) -{ - loff_t pos = 0x46; - int ret; - - ret = efuse_read_usr(addr, ETH_ALEN, &pos); - if (ret < 0) - memset(addr, 0, ETH_ALEN); -} -EXPORT_SYMBOL(odroid_get_ether_addr); #endif static long efuse_unlocked_ioctl(struct file *file, unsigned int cmd, diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c index b497aed4cd12..1ee7572990c7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c @@ -127,13 +127,6 @@ static void dwmac1000_get_umac_addr(struct mac_device_info *hw, unsigned int reg_n) { void __iomem *ioaddr = hw->pcsr; - -#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON) - odroid_get_ether_addr(addr); - if (is_valid_ether_addr(addr)) - return; -#endif - stmmac_get_mac_addr(ioaddr, addr, GMAC_ADDR_HIGH(reg_n), GMAC_ADDR_LOW(reg_n)); }