diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-27 19:30:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-27 19:30:13 +0100 |
| commit | e4e4146ec5a0a4221eee051365422ad70cddb673 (patch) | |
| tree | 96e99d23ebc31fad84e40cb323dfe33b0e6af6d0 /arch/arm/mach-orion5x/ts409-setup.c | |
| parent | 9abc6461a3802702ada88cbac1fed045dbd9b466 (diff) | |
| parent | 8e05de88cf5a8ab225697ba12d5f19ec594169ef (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/mach-orion5x/ts409-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/ts409-setup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c index b27d2b76208..d85588ac7ef 100644 --- a/arch/arm/mach-orion5x/ts409-setup.c +++ b/arch/arm/mach-orion5x/ts409-setup.c @@ -278,6 +278,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, @@ -285,10 +289,7 @@ static void __init qnap_ts409_init(void) orion5x_eth_init(&qnap_tsx09_eth_data); 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); + orion5x_uart1_init(); platform_device_register(&qnap_ts409_button_device); |