From 537c4abb6fce41347c11ecca10f6b1f07089c07c Mon Sep 17 00:00:00 2001 From: Jan Weitzel Date: Tue, 10 Dec 2013 15:30:09 +0100 Subject: ARM: OMAP: early call am33xx_register_ethaddr am33xx_register_ethaddr must be called before cpsw driver start. Move it from devices_initcall to coredevice_initcall. Signed-off-by: Jan Weitzel Signed-off-by: Sascha Hauer --- arch/arm/boards/beaglebone/board.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'arch/arm/boards/beaglebone') diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c index 439c4c21f8..6445d81001 100644 --- a/arch/arm/boards/beaglebone/board.c +++ b/arch/arm/boards/beaglebone/board.c @@ -40,6 +40,16 @@ #include "beaglebone.h" +static int beaglebone_coredevice_init(void) +{ + if (!of_machine_is_compatible("ti,am335x-bone")) + return 0; + + am33xx_register_ethaddr(0, 0); + return 0; +} +coredevice_initcall(beaglebone_coredevice_init); + static int beaglebone_devices_init(void) { int black; @@ -54,8 +64,6 @@ static int beaglebone_devices_init(void) omap_set_bootmmc_devname("mmc1"); } - am33xx_register_ethaddr(0, 0); - black = is_beaglebone_black(); globalvar_add_simple("board.variant", black ? "boneblack" : "bone"); -- cgit v1.2.3