aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/ts209-setup.c
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2008-08-09 11:13:33 -0400
committerNicolas Pitre <nico@cam.org>2008-08-21 22:15:17 -0400
commit35228e840acc70b49a2eab4eb308ca3d544efdcf (patch)
treec8683cc4a054f3ae2a8aefc77dc293e2e1fbdd04 /arch/arm/mach-orion5x/ts209-setup.c
parent7a6bb2622692495d1b7445a3e8c257601b803b02 (diff)
[ARM] Orion: fix MAC detection on QNAP TS-209 and TS-409
Flash needs to be set up before we can try to read the MAC address from there. Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion5x/ts209-setup.c')
-rw-r--r--arch/arm/mach-orion5x/ts209-setup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index dd657163cd8d..bcd4b2a10d68 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -287,6 +287,10 @@ static void __init qnap_ts209_init(void)
287 /* 287 /*
288 * Configure peripherals. 288 * Configure peripherals.
289 */ 289 */
290 orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
291 QNAP_TS209_NOR_BOOT_SIZE);
292 platform_device_register(&qnap_ts209_nor_flash);
293
290 orion5x_ehci0_init(); 294 orion5x_ehci0_init();
291 orion5x_ehci1_init(); 295 orion5x_ehci1_init();
292 qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE + 296 qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE +
@@ -298,10 +302,6 @@ static void __init qnap_ts209_init(void)
298 orion5x_uart0_init(); 302 orion5x_uart0_init();
299 orion5x_xor_init(); 303 orion5x_xor_init();
300 304
301 orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
302 QNAP_TS209_NOR_BOOT_SIZE);
303 platform_device_register(&qnap_ts209_nor_flash);
304
305 platform_device_register(&qnap_ts209_button_device); 305 platform_device_register(&qnap_ts209_button_device);
306 306
307 /* Get RTC IRQ and register the chip */ 307 /* Get RTC IRQ and register the chip */