aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-01-13 10:15:39 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-01-13 10:15:39 +0000
commit2e54e4a54bf58a76bcd61b63a63cf5ee63244834 (patch)
tree137bca1a271b76237c47b66a0c7fb422592ee974 /target/linux/adm5120
parenta666ad0a37e5d36845d185bd9275402728d241cb (diff)
downloadupstream-2e54e4a54bf58a76bcd61b63a63cf5ee63244834.tar.gz
upstream-2e54e4a54bf58a76bcd61b63a63cf5ee63244834.tar.bz2
upstream-2e54e4a54bf58a76bcd61b63a63cf5ee63244834.zip
[adm5120] NFS-101U/WU: add PCI irq map and change vlan map
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14021 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120')
-rw-r--r--target/linux/adm5120/files/arch/mips/adm5120/cellvision/nfs-101.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/cellvision/nfs-101.c b/target/linux/adm5120/files/arch/mips/adm5120/cellvision/nfs-101.c
index 1975736252..3ad99ac925 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/cellvision/nfs-101.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/cellvision/nfs-101.c
@@ -1,7 +1,7 @@
/*
* Cellvision/SparkLAN NFS-101U/WU support
*
- * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2007-2009 Gabor Juhos <juhosg@openwrt.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
@@ -11,8 +11,16 @@
#include "cellvision.h"
-static u8 nfs101_vlans[6] __initdata = { /* TODO: not tested */
- 0x41, 0x42, 0x44, 0x48, 0x50, 0x00
+static struct adm5120_pci_irq nfs101_pci_irqs[] __initdata = {
+ /* FIXME: not tested */
+ PCIIRQ(2, 0, 1, ADM5120_IRQ_PCI0),
+ PCIIRQ(3, 0, 2, ADM5120_IRQ_PCI2),
+ PCIIRQ(3, 3, 1, ADM5120_IRQ_PCI1)
+};
+
+static u8 nfs101_vlans[6] __initdata = {
+ /* FIXME: not tested */
+ 0x5f, 0x00, 0x00, 0x00, 0x00, 0x00
};
static void __init nfs101_setup(void)
@@ -22,7 +30,10 @@ static void __init nfs101_setup(void)
adm5120_add_device_uart(0);
adm5120_add_device_uart(1);
- adm5120_add_device_switch(5, nfs101_vlans);
+ adm5120_add_device_switch(1, nfs101_vlans);
+
+ adm5120_pci_set_irq_map(ARRAY_SIZE(nfs101_pci_irqs),
+ nfs101_pci_irqs);
}
MIPS_MACHINE(MACH_ADM5120_NFS101U, "Cellvision NFS-101U/101WU", nfs101_setup);