mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 13/14] at91sam9x5ek: Configure Ethernet in DT
Date: Thu, 23 Mar 2017 06:23:57 -0700	[thread overview]
Message-ID: <20170323132358.8539-14-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20170323132358.8539-1-andrew.smirnov@gmail.com>

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 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@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2017-03-23 13:24 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-23 13:23 [PATCH 00/14] AT91, at91sam9x5ek updates (part III/III) Andrey Smirnov
2017-03-23 13:23 ` [PATCH 01/14] at91sam9x5ek: Convert to mult-image build Andrey Smirnov
2017-04-16  8:24   ` Sam Ravnborg
2017-04-19  9:46     ` Sascha Hauer
2017-03-23 13:23 ` [PATCH 02/14] at91sam9x5ek: Add CONFIG_KALLSYMS to defconfig Andrey Smirnov
2017-03-23 13:23 ` [PATCH 03/14] at91sam9x5ek: Add preliminary device tree support Andrey Smirnov
2017-03-23 13:23 ` [PATCH 04/14] at91sam9x5ek: Convert to use DT clock tree Andrey Smirnov
2017-03-23 13:23 ` [PATCH 05/14] at91sam9x5ek: Remove at91sam9x5ek_mem_init() Andrey Smirnov
2017-03-23 13:23 ` [PATCH 06/14] at91: Enable PINCTRL for SOC_AT91SAM9 Andrey Smirnov
2017-03-23 13:23 ` [PATCH 07/14] at91sam9x5ek: Configure LEDs in DT Andrey Smirnov
2017-03-23 13:23 ` [PATCH 08/14] at91sam9x5ek: Configure I2C via DT Andrey Smirnov
2017-03-23 13:23 ` [PATCH 09/14] at91sam9x5ek: Configure MMC in DT Andrey Smirnov
2017-03-23 13:23 ` [PATCH 10/14] at91sam9x5ek: Configure SPI " Andrey Smirnov
2017-03-23 13:23 ` [PATCH 11/14] at91sam9x5ek: Configure 1-wire " Andrey Smirnov
2017-03-23 13:23 ` [PATCH 12/14] at91sam9x5ek: Configure USB " Andrey Smirnov
2017-03-23 13:23 ` Andrey Smirnov [this message]
2017-03-23 13:23 ` [PATCH 14/14] at91sam9x5ek: Configure NAND " Andrey Smirnov
2017-03-29  6:33 ` [PATCH 00/14] AT91, at91sam9x5ek updates (part III/III) Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170323132358.8539-14-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox