---

yaml --- r: 175871 b: refs/heads/master c: ec66969 h: refs/heads/master i: 175869: b2c7374 175867: fa5a948 175863: 937ec73 175855: 7d15891 175839: 31de0ed 175807: 9a483ba 175743: 225c6a1 175615: d226a2b v: v3
git-mirror · Dec 5, 2009 · 7fa74d9 · 7fa74d9
1 parent 7a25a6e
commit 7fa74d9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 52 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bf4d676898b1f083a7ee20a0c6aacf2886eb49d
+refs/heads/master: ec66969685ecf04e8a5036369702fa9aec07cc17
diff --git a/trunk/arch/arm/mach-ixp4xx/avila-pci.c b/trunk/arch/arm/mach-ixp4xx/avila-pci.c
@@ -22,12 +22,26 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/delay.h>
-
 #include <asm/mach/pci.h>
 #include <asm/irq.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 
+#define AVILA_PCI_MAX_DEV	4
+#define LOFT_PCI_MAX_DEV	6
+#define AVILA_PCI_IRQ_LINES	4
+
+/* PCI controller GPIO to IRQ pin mappings */
+#define AVILA_PCI_INTA_PIN	11
+#define AVILA_PCI_INTB_PIN	10
+#define AVILA_PCI_INTC_PIN	9
+#define AVILA_PCI_INTD_PIN	8
+
+#define IRQ_AVILA_PCI_INTA	IRQ_IXP4XX_GPIO11
+#define IRQ_AVILA_PCI_INTB	IRQ_IXP4XX_GPIO10
+#define IRQ_AVILA_PCI_INTC	IRQ_IXP4XX_GPIO9
+#define IRQ_AVILA_PCI_INTD	IRQ_IXP4XX_GPIO8
+
 void __init avila_pci_preinit(void)
 {
 	set_irq_type(IRQ_AVILA_PCI_INTA, IRQ_TYPE_LEVEL_LOW);

diff --git a/trunk/arch/arm/mach-ixp4xx/avila-setup.c b/trunk/arch/arm/mach-ixp4xx/avila-setup.c
@@ -19,7 +19,6 @@
 #include <linux/serial_8250.h>
 #include <linux/slab.h>
 #include <linux/i2c-gpio.h>
-
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
@@ -29,6 +28,9 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 
+#define AVILA_SDA_PIN	7
+#define AVILA_SCL_PIN	6
+
 static struct flash_platform_data avila_flash_data = {
 	.map_name	= "cfi_probe",
 	.width		= 2,

diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/avila.h b/trunk/arch/arm/mach-ixp4xx/include/mach/avila.h
diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/hardware.h b/trunk/arch/arm/mach-ixp4xx/include/mach/hardware.h
@@ -44,7 +44,6 @@
 #include "platform.h"
 
 /* Platform specific details */
-#include "avila.h"
 #include "coyote.h"
 #include "prpmc1100.h"
 #include "nslu2.h"

diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/irqs.h b/trunk/arch/arm/mach-ixp4xx/include/mach/irqs.h
@@ -70,15 +70,6 @@
 
 #define	XSCALE_PMU_IRQ		(IRQ_IXP4XX_XSCALE_PMU)
 
-/*
- * Gateworks Avila board IRQs
- */
-#define	IRQ_AVILA_PCI_INTA	IRQ_IXP4XX_GPIO11
-#define	IRQ_AVILA_PCI_INTB	IRQ_IXP4XX_GPIO10
-#define	IRQ_AVILA_PCI_INTC	IRQ_IXP4XX_GPIO9
-#define	IRQ_AVILA_PCI_INTD	IRQ_IXP4XX_GPIO8
-
-
 /*
  * PrPMC1100 Board IRQs
  */