diff mbox series

board: atmel: common: introduce at91_set_eth1addr for second interface

Message ID 20200805123034.176792-1-eugen.hristev@microchip.com
State Awaiting Upstream
Delegated to: Eugen Hristev
Headers show
Series board: atmel: common: introduce at91_set_eth1addr for second interface | expand

Commit Message

Eugen Hristev Aug. 5, 2020, 12:30 p.m. UTC
We already have a function to retrieve the mac address from one EEPROM.
For boards with a second Ethernet interface, however, we would
require another EEPROM with a second unique MAC address.
Introduce at91_set_eth1addr which will look for a second EEPROM
and set the 'eth1addr' variable with the obtained MAC address.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
 arch/arm/mach-at91/include/mach/at91_common.h |  1 +
 board/atmel/common/mac_eeprom.c               | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+)

Comments

Eugen Hristev Sept. 8, 2020, 1:20 p.m. UTC | #1
On 05.08.2020 15:30, Eugen Hristev wrote:
> We already have a function to retrieve the mac address from one EEPROM.
> For boards with a second Ethernet interface, however, we would
> require another EEPROM with a second unique MAC address.
> Introduce at91_set_eth1addr which will look for a second EEPROM
> and set the 'eth1addr' variable with the obtained MAC address.
> 
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
> ---

Applied to u-boot-atmel/next
diff mbox series

Patch

diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h
index 01e00c508a..f7b411cf7d 100644
--- a/arch/arm/mach-at91/include/mach/at91_common.h
+++ b/arch/arm/mach-at91/include/mach/at91_common.h
@@ -40,6 +40,7 @@  void configure_ddrcfg_input_buffers(bool open);
 #endif
 
 int at91_set_ethaddr(int offset);
+int at91_set_eth1addr(int offset);
 void at91_spi_nor_set_ethaddr(void);
 int at91_video_show_board_info(void);
 
diff --git a/board/atmel/common/mac_eeprom.c b/board/atmel/common/mac_eeprom.c
index 050aa51ee1..0f038beee6 100644
--- a/board/atmel/common/mac_eeprom.c
+++ b/board/atmel/common/mac_eeprom.c
@@ -35,3 +35,36 @@  int at91_set_ethaddr(int offset)
 
 	return 0;
 }
+
+/* this function will set eth1addr from a second eeprom, if available */
+int at91_set_eth1addr(int offset)
+{
+	const int ETH_ADDR_LEN = 6;
+	unsigned char ethaddr[ETH_ADDR_LEN];
+	/* configure eth1addr for second interface */
+	const char *ETHADDR_NAME = "eth1addr";
+	struct udevice *dev;
+	int ret;
+
+	if (env_get(ETHADDR_NAME))
+		return 0;
+
+	/* first eeprom is retrieved, this is for the first interface */
+	ret = uclass_first_device_err(UCLASS_I2C_EEPROM, &dev);
+	if (ret)
+		return ret;
+
+	/* attempt to obtain a second eeprom device */
+	ret = uclass_next_device(&dev);
+	if (ret)
+		return ret;
+
+	ret = i2c_eeprom_read(dev, offset, ethaddr, 6);
+	if (ret)
+		return ret;
+
+	if (is_valid_ethaddr(ethaddr))
+		eth_env_set_enetaddr(ETHADDR_NAME, ethaddr);
+
+	return 0;
+}