[adm5120] add support for GPIO IRQs

[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..0ac85f5 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,13 @@
 
 #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>
+
+#define PFX    "adm5120: "
 
 static LIST_HEAD(adm5120_boards);
 static char adm5120_board_name[ADM5120_BOARD_NAMELEN];
@@ -70,17 +72,19 @@ static int __init adm5120_board_setup(void)
 
        board = adm5120_board_find(mips_machtype);
        if (board == NULL) {
-               printk(KERN_ALERT "adm5120: no board registered for machtype %lu"
-                       ", trying generic\n", mips_machtype);
+               printk(KERN_ALERT PFX"no board registered for "
+                       "machtype %lu, trying generic\n", mips_machtype);
                board = adm5120_board_find(MACH_ADM5120_GENERIC);
                if (board == NULL)
-                       panic("adm5120: unsupported board\n");
+                       panic(PFX "unsupported board\n");
        }
 
-       printk(KERN_INFO "adm5120: setting up board '%s'\n", board->name);
+       printk(KERN_INFO PFX "setting up board '%s'\n", board->name);
 
        memcpy(&adm5120_board_name, board->name, ADM5120_BOARD_NAMELEN);
 
+       adm5120_gpio_init();
+
        adm5120_board_reset = board->board_reset;
        if (board->eth_num_ports > 0)
                adm5120_eth_num_ports = board->eth_num_ports;
@@ -89,7 +93,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,33 +100,25 @@ 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);
+       /* register built-in ethernet switch */
+       platform_device_register(&adm5120_switch_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 ) {
+       if (board->num_devices > 0 && board->devices != NULL) {
                err = platform_add_devices(board->devices, board->num_devices);
                if (err)
-                       printk(KERN_ALERT "adm5120: adding board devices failed\n");
+                       printk(KERN_ALERT PFX "adding board devices failed\n");
        }
 
        return 0;
 }
+arch_initcall(adm5120_board_setup);
 
 void __init adm5120_board_register(struct adm5120_board *board)
 {
-       list_add(&board->list, &adm5120_boards);
-       printk(KERN_INFO "adm5120: registered board '%s'\n", board->name);
+       list_add_tail(&board->list, &adm5120_boards);
+       printk(KERN_INFO PFX "registered board '%s'\n", board->name);
 }
-
-void __init adm5120_register_boards(struct adm5120_board **boards,
-               int num)
-{
-       int i;
-
-       for (i=0; i<num; i++)
-               adm5120_board_register(boards[i]);
-}
-
-arch_initcall(adm5120_board_setup);