Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ARM] Orion: fix MAC detection on QNAP TS-209 and TS-409

Browse Source 
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>
This commit is contained in:
Martin Michlmayr 2008-08-09 18:13:33 +03:00 committed by Nicolas Pitre
parent 7a6bb26226
commit 35228e840a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-orion5x/ts209-setup.c
View File

@ -287,6 +287,10 @@ static void __init qnap_ts209_init(void)
/* /*
* Configure peripherals. * Configure peripherals.
*/ */
orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
QNAP_TS209_NOR_BOOT_SIZE);
platform_device_register(&qnap_ts209_nor_flash);
orion5x_ehci0_init(); orion5x_ehci0_init();
orion5x_ehci1_init(); orion5x_ehci1_init();
qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE + qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE +
@ -298,10 +302,6 @@ static void __init qnap_ts209_init(void)
orion5x_uart0_init(); orion5x_uart0_init();
orion5x_xor_init(); orion5x_xor_init();
orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
QNAP_TS209_NOR_BOOT_SIZE);
platform_device_register(&qnap_ts209_nor_flash);
platform_device_register(&qnap_ts209_button_device); platform_device_register(&qnap_ts209_button_device);
/* Get RTC IRQ and register the chip */ /* Get RTC IRQ and register the chip */

8
arch/arm/mach-orion5x/ts409-setup.c
View File

@ -278,6 +278,10 @@ static void __init qnap_ts409_init(void)
/* /*
* Configure peripherals. * Configure peripherals.
*/ */
orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE,
QNAP_TS409_NOR_BOOT_SIZE);
platform_device_register(&qnap_ts409_nor_flash);
orion5x_ehci0_init(); orion5x_ehci0_init();
qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE + qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE +
qnap_ts409_partitions[5].offset, qnap_ts409_partitions[5].offset,
@ -286,10 +290,6 @@ static void __init qnap_ts409_init(void)
orion5x_i2c_init(); orion5x_i2c_init();
orion5x_uart0_init(); orion5x_uart0_init();
orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE,
QNAP_TS409_NOR_BOOT_SIZE);
platform_device_register(&qnap_ts409_nor_flash);
platform_device_register(&qnap_ts409_button_device); platform_device_register(&qnap_ts409_button_device);
/* Get RTC IRQ and register the chip */ /* Get RTC IRQ and register the chip */