[adm5120] fix initcall level of adm5120_board_setup()

[openwrt.git] / target / linux / adm5120 / files / arch / mips / adm5120 / board.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/board.c b/target/linux/adm5120/files/arch/mips/adm5120/board.c
index 74bacaa..44e59aa 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/board.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/board.c
@@ -31,11 +31,11 @@
 
 #include <asm/bootinfo.h>
 
-#include <asm/mach-adm5120/adm5120_info.h>
-#include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
-#include <asm/mach-adm5120/adm5120_board.h>
-#include <asm/mach-adm5120/adm5120_platform.h>
+#include <adm5120_info.h>
+#include <adm5120_defs.h>
+#include <adm5120_irq.h>
+#include <adm5120_board.h>
+#include <adm5120_platform.h>
 
 static LIST_HEAD(adm5120_boards);
 static char adm5120_board_name[ADM5120_BOARD_NAMELEN];
@@ -89,7 +89,6 @@ static int __init adm5120_board_setup(void)
                memcpy(adm5120_eth_vlans, board->eth_vlans,
                        sizeof(adm5120_eth_vlans));
 
-
        if (board->board_setup)
                board->board_setup();
 
@@ -97,9 +96,8 @@ static int __init adm5120_board_setup(void)
        amba_device_register(&adm5120_uart0_device, &iomem_resource);
        amba_device_register(&adm5120_uart1_device, &iomem_resource);
 
-       /* register PCI controller */
-       if (adm5120_package_bga())
-               platform_device_register(&adm5120_pci_device);
+       /* setup PCI irq map */
+       adm5120_pci_set_irq_map(board->pci_nr_irqs, board->pci_irq_map);
 
        /* register board devices */
        if (board->num_devices > 0 && board->devices != NULL ) {
@@ -110,6 +108,7 @@ static int __init adm5120_board_setup(void)
 
        return 0;
 }
+arch_initcall(adm5120_board_setup);
 
 void __init adm5120_board_register(struct adm5120_board *board)
 {
@@ -126,4 +125,3 @@ void __init adm5120_register_boards(struct adm5120_board **boards,
                adm5120_board_register(boards[i]);
 }
 
-arch_initcall(adm5120_board_setup);