From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 13 Jan 2009 10:15:39 +0000 (+0000)
Subject: NFS-101U/WU: add PCI irq map and change vlan map
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3890a38fed268e36fb6c84847fd1ecb62ced7ebc;p=openwrt%2Fstaging%2Fnbd.git

NFS-101U/WU: add PCI irq map and change vlan map

SVN-Revision: 14021
---

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);