[PATCH] openrisc: move ethoc registration to device_initcall

Franck Jullien franck.jullien at gmail.com
Sat May 10 15:42:04 PDT 2014


Signed-off-by: Franck Jullien <franck.jullien at gmail.com>
---
 arch/openrisc/boards/generic/generic.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/arch/openrisc/boards/generic/generic.c b/arch/openrisc/boards/generic/generic.c
index 9f68007..5c1698d 100644
--- a/arch/openrisc/boards/generic/generic.c
+++ b/arch/openrisc/boards/generic/generic.c
@@ -9,6 +9,18 @@ static struct NS16550_plat serial_plat = {
 	.shift = 0,
 };
 
+static int openrisc_devices_init(void)
+{
+#ifdef CONFIG_DRIVER_NET_ETHOC
+	add_generic_device("ethoc", DEVICE_ID_DYNAMIC, NULL,
+			   OPENRISC_SOPC_ETHOC_BASE, 0x1000,
+			   IORESOURCE_MEM, NULL);
+#endif
+	return 0;
+}
+
+device_initcall(openrisc_devices_init);
+
 static int openrisc_console_init(void)
 {
 	barebox_set_model("OpenRISC or1k");
@@ -18,12 +30,6 @@ static int openrisc_console_init(void)
 	add_ns16550_device(DEVICE_ID_DYNAMIC, OPENRISC_SOPC_UART_BASE, 1024,
 			   IORESOURCE_MEM | IORESOURCE_MEM_8BIT, &serial_plat);
 
-#ifdef CONFIG_DRIVER_NET_ETHOC
-	add_generic_device("ethoc", DEVICE_ID_DYNAMIC, NULL,
-			   OPENRISC_SOPC_ETHOC_BASE, 0x1000,
-			   IORESOURCE_MEM, NULL);
-#endif
-
 	return 0;
 }
 
-- 
1.7.1




More information about the barebox mailing list