Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
---
arch/arm/boards/at91sam9x5ek/init.c | 18 ++++++++----------
arch/arm/dts/at91sam9x5ek.dts | 7 +++++++
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c
index ff0ef22..29da97d 100644
--- a/arch/arm/boards/at91sam9x5ek/init.c
+++ b/arch/arm/boards/at91sam9x5ek/init.c
@@ -106,18 +106,17 @@ static void ek_add_device_nand(void)
at91_add_device_nand(&nand_pdata);
}
-static struct macb_platform_data macb_pdata = {
- .phy_interface = PHY_INTERFACE_MODE_RMII,
- .phy_addr = 0,
-};
-
-static void ek_add_device_eth(void)
+static int ek_register_mac_address(void)
{
- if (w1_local_mac_address_register(0, "tml", "w1-2d-0"))
- w1_local_mac_address_register(0, "tml", "w1-23-0");
+ int ret;
+
+ ret = w1_local_mac_address_register(0, "tml", "w1-2d-0");
+ if (!ret)
+ return ret;
- at91_add_device_eth(0, &macb_pdata);
+ return w1_local_mac_address_register(0, "tml", "w1-23-0");
}
+late_initcall(ek_register_mac_address);
#if defined(CONFIG_DRIVER_VIDEO_ATMEL_HLCD)
/*
@@ -165,7 +164,6 @@ static void ek_add_device_lcdc(void) {}
static int at91sam9x5ek_devices_init(void)
{
ek_add_device_nand();
- ek_add_device_eth();
ek_add_device_lcdc();
armlinux_set_architecture(CONFIG_MACH_AT91SAM9X5EK);
diff --git a/arch/arm/dts/at91sam9x5ek.dts b/arch/arm/dts/at91sam9x5ek.dts
index c169181..d5c7a8f 100644
--- a/arch/arm/dts/at91sam9x5ek.dts
+++ b/arch/arm/dts/at91sam9x5ek.dts
@@ -4,6 +4,7 @@
#include <dt-bindings/pinctrl/at91.h>
#include <arm/at91sam9x5.dtsi>
+#include <arm/at91sam9x5_macb0.dtsi>
#include <arm/at91sam9x5_lcd.dtsi>
#include <arm/at91sam9x5dm.dtsi>
#include <arm/at91sam9x5ek.dtsi>
@@ -61,3 +62,9 @@
&mmc1 {
status = "disabled";
};
+
+&macb0 {
+ status = "okay";
+ phy-mode = "rmii";
+};
+
--
2.9.3
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
