Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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>
authored by Martin Michlmayr and committed by Nicolas Pitre 35228e84 7a6bb262
+4
-4
arch/arm/mach-orion5x/ts209-setup.c
+4
-4
arch/arm/mach-orion5x/ts209-setup.c
···
287
/*
288
* Configure peripherals.
289
*/
290
orion5x_ehci0_init();
291
orion5x_ehci1_init();
292
qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE +
···
301
orion5x_sata_init(&qnap_ts209_sata_data);
302
orion5x_uart0_init();
303
orion5x_xor_init();
304
-
305
-
orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
306
-
QNAP_TS209_NOR_BOOT_SIZE);
307
-
platform_device_register(&qnap_ts209_nor_flash);
308
309
platform_device_register(&qnap_ts209_button_device);
310
···
287
/*
288
* Configure peripherals.
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
+
294
orion5x_ehci0_init();
295
orion5x_ehci1_init();
296
qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE +
···
297
orion5x_sata_init(&qnap_ts209_sata_data);
298
orion5x_uart0_init();
299
orion5x_xor_init();
300
301
platform_device_register(&qnap_ts209_button_device);
302
+4
-4
arch/arm/mach-orion5x/ts409-setup.c
+4
-4
arch/arm/mach-orion5x/ts409-setup.c
···
278
/*
279
* Configure peripherals.
280
*/
281
orion5x_ehci0_init();
282
qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE +
283
qnap_ts409_partitions[5].offset,
···
289
orion5x_eth_init(&qnap_tsx09_eth_data);
290
orion5x_i2c_init();
291
orion5x_uart0_init();
292
-
293
-
orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE,
294
-
QNAP_TS409_NOR_BOOT_SIZE);
295
-
platform_device_register(&qnap_ts409_nor_flash);
296
297
platform_device_register(&qnap_ts409_button_device);
298
···
278
/*
279
* Configure peripherals.
280
*/
281
+
orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE,
282
+
QNAP_TS409_NOR_BOOT_SIZE);
283
+
platform_device_register(&qnap_ts409_nor_flash);
284
+
285
orion5x_ehci0_init();
286
qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE +
287
qnap_ts409_partitions[5].offset,
···
285
orion5x_eth_init(&qnap_tsx09_eth_data);
286
orion5x_i2c_init();
287
orion5x_uart0_init();
288
289
platform_device_register(&qnap_ts409_button_device);
290