[adm5120] fix mach_type for the WP54G-WRT board

[openwrt/svn-archive/archive.git] / target / linux / adm5120 / files / arch / mips / adm5120 / boards / compex.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c
index 37950932bde0cc3ec7e612999f842a7a11008d5e..d1e2edd02422758bd5ec0c297aa5e69da9a217f0 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c
@@ -29,8 +29,9 @@
 #include <asm/bootinfo.h>
 #include <asm/gpio.h>
 
-#include <asm/mach-adm5120/adm5120_board.h>
-#include <asm/mach-adm5120/adm5120_platform.h>
+#include <adm5120_board.h>
+#include <adm5120_platform.h>
+#include <adm5120_irq.h>
 
 static void switch_bank_gpio5(unsigned bank)
 {
@@ -49,6 +50,17 @@ static void wp54_reset(void)
        gpio_set_value(ADM5120_GPIO_PIN3, 0);
 }
 
+static struct adm5120_pci_irq wp54_pci_irqs[] __initdata = {
+       PCIIRQ(2, 0, 1, ADM5120_IRQ_PCI0),
+};
+
+static struct adm5120_pci_irq np28g_pci_irqs[] __initdata = {
+       PCIIRQ(2, 0, 1, ADM5120_IRQ_PCI0),
+       PCIIRQ(3, 0, 1, ADM5120_IRQ_PCI0),
+       PCIIRQ(3, 1, 2, ADM5120_IRQ_PCI1),
+       PCIIRQ(3, 2, 3, ADM5120_IRQ_PCI2)
+};
+
 static struct mtd_partition wp54g_wrt_partitions[] = {
        {
                .name   = "cfe",
@@ -123,12 +135,10 @@ unsigned char np27g_vlans[6] __initdata = {
 };
 
 unsigned char np28g_vlans[6] __initdata = {
-       /* FIXME: untested */
-       0x41, 0x42, 0x44, 0x48, 0x00, 0x00
+       0x50, 0x42, 0x44, 0x48, 0x00, 0x00
 };
 
 unsigned char wp54_vlans[6] __initdata = {
-       /* FIXME: untested */
        0x41, 0x42, 0x00, 0x00, 0x00, 0x00
 };
 
@@ -150,6 +160,8 @@ static struct adm5120_board np28g_board __initdata = {
        .eth_vlans      = np28g_vlans,
        .num_devices    = ARRAY_SIZE(np2xg_devices),
        .devices        = np2xg_devices,
+       .pci_nr_irqs    = ARRAY_SIZE(np28g_pci_irqs),
+       .pci_irq_map    = np28g_pci_irqs,
 };
 
 static struct adm5120_board wp54ag_board __initdata = {
@@ -161,6 +173,8 @@ static struct adm5120_board wp54ag_board __initdata = {
        .eth_vlans      = wp54_vlans,
        .num_devices    = ARRAY_SIZE(wp54_devices),
        .devices        = wp54_devices,
+       .pci_nr_irqs    = ARRAY_SIZE(wp54_pci_irqs),
+       .pci_irq_map    = wp54_pci_irqs,
 };
 
 static struct adm5120_board wp54g_board __initdata = {
@@ -172,10 +186,12 @@ static struct adm5120_board wp54g_board __initdata = {
        .eth_vlans      = wp54_vlans,
        .num_devices    = ARRAY_SIZE(wp54_devices),
        .devices        = wp54_devices,
+       .pci_nr_irqs    = ARRAY_SIZE(wp54_pci_irqs),
+       .pci_irq_map    = wp54_pci_irqs,
 };
 
 static struct adm5120_board wp54g_wrt_board __initdata = {
-       .mach_type      = MACH_ADM5120_WP54G,
+       .mach_type      = MACH_ADM5120_WP54G_WRT,
        .name           = "Compex WP54G-WRT",
        .board_setup    = wp54_wrt_setup,
        .board_reset    = wp54_reset,
@@ -183,6 +199,8 @@ static struct adm5120_board wp54g_wrt_board __initdata = {
        .eth_vlans      = wp54_vlans,
        .num_devices    = ARRAY_SIZE(wp54_devices),
        .devices        = wp54_devices,
+       .pci_nr_irqs    = ARRAY_SIZE(wp54_pci_irqs),
+       .pci_irq_map    = wp54_pci_irqs,
 };
 
 static struct adm5120_board wpp54ag_board __initdata = {
@@ -194,6 +212,8 @@ static struct adm5120_board wpp54ag_board __initdata = {
        .eth_vlans      = wp54_vlans,
        .num_devices    = ARRAY_SIZE(wp54_devices),
        .devices        = wp54_devices,
+       .pci_nr_irqs    = ARRAY_SIZE(wp54_pci_irqs),
+       .pci_irq_map    = wp54_pci_irqs,
 };
 
 static struct adm5120_board wpp54g_board __initdata = {
@@ -205,6 +225,8 @@ static struct adm5120_board wpp54g_board __initdata = {
        .eth_vlans      = wp54_vlans,
        .num_devices    = ARRAY_SIZE(wp54_devices),
        .devices        = wp54_devices,
+       .pci_nr_irqs    = ARRAY_SIZE(wp54_pci_irqs),
+       .pci_irq_map    = wp54_pci_irqs,
 };
 
 static int __init register_boards(void)