Commit 35228e84 authored by Martin Michlmayr's avatar Martin Michlmayr Committed by Nicolas Pitre

[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: default avatarMartin Michlmayr <tbm@cyrius.com>
Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
parent 7a6bb262
...@@ -287,6 +287,10 @@ static void __init qnap_ts209_init(void) ...@@ -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) ...@@ -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 */
......
...@@ -278,6 +278,10 @@ static void __init qnap_ts409_init(void) ...@@ -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) ...@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment