61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
Subject: [PATCH] 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>
|
|
|
|
|
|
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
|
|
index 809132d..2bce0a5 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)
|
|
/*
|
|
* 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_ehci1_init();
|
|
qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE +
|
|
@@ -297,10 +301,6 @@ static void __init qnap_ts209_init(void)
|
|
orion5x_sata_init(&qnap_ts209_sata_data);
|
|
orion5x_uart0_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);
|
|
|
|
/* Get RTC IRQ and register the chip */
|
|
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c
|
|
index 6053e76..3edc6bf 100644
|
|
--- a/arch/arm/mach-orion5x/ts409-setup.c
|
|
+++ b/arch/arm/mach-orion5x/ts409-setup.c
|
|
@@ -231,6 +231,10 @@ static void __init qnap_ts409_init(void)
|
|
/*
|
|
* 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();
|
|
qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE +
|
|
qnap_ts409_partitions[5].offset,
|
|
@@ -239,10 +243,6 @@ static void __init qnap_ts409_init(void)
|
|
orion5x_i2c_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);
|
|
|
|
/* Get RTC IRQ and register the chip */
|