From 7fa74d91649d08e5b040f5843da2c94137939c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= <khc@pm.waw.pl>
Date: Mon, 16 Nov 2009 15:39:11 +0100
Subject: [PATCH] --- yaml --- r: 175871 b: refs/heads/master c:
 ec66969685ecf04e8a5036369702fa9aec07cc17 h: refs/heads/master i:   175869:
 b2c7374eb8a0aea2ecc91db7823575d3fe1da8bc   175867:
 fa5a948db8e4ee8279a6967db4bdad5708f11ad4   175863:
 937ec73a773a701082f8430510d98c703e822ee9   175855:
 7d15891cf5595f972934e2b0bd62f43cffee57c2   175839:
 31de0edb639ccdba72115b9017b12a7a03bc64a3   175807:
 9a483bab38e6bdfbb4fc7e1183518b57bfa0b126   175743:
 225c6a1adf7808870b1c66207cdb27d8c5104e92   175615:
 d226a2b27996bf55d2270ac5cb62ee904692fe86 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-ixp4xx/avila-pci.c        | 16 +++++++-
 trunk/arch/arm/mach-ixp4xx/avila-setup.c      |  4 +-
 .../arch/arm/mach-ixp4xx/include/mach/avila.h | 39 -------------------
 .../arm/mach-ixp4xx/include/mach/hardware.h   |  1 -
 .../arch/arm/mach-ixp4xx/include/mach/irqs.h  |  9 -----
 6 files changed, 19 insertions(+), 52 deletions(-)
 delete mode 100644 trunk/arch/arm/mach-ixp4xx/include/mach/avila.h

diff --git a/[refs] b/[refs]
index 218169daf196..65916fc09a46 100644
--- 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
index 08d65dcdb5fe..14df8cf49146 100644
--- 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
index 797995ce18b9..6e558a76457d 100644
--- 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
deleted file mode 100644
index 1640cb61972b..000000000000
--- a/trunk/arch/arm/mach-ixp4xx/include/mach/avila.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * arch/arm/mach-ixp4xx/include/mach/avila.h
- *
- * Gateworks Avila platform specific definitions
- *
- * Author: Michael-Luke Jones <mlj28@cam.ac.uk>
- *
- * Based on ixdp425.h
- * Author: Deepak Saxena <dsaxena@plexity.net>
- *
- * Copyright 2004 (c) MontaVista, Software, Inc.
- *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __ASM_ARCH_HARDWARE_H__
-#error "Do not include this directly, instead #include <mach/hardware.h>"
-#endif
-
-#define	AVILA_SDA_PIN		7
-#define	AVILA_SCL_PIN		6
-
-/*
- * AVILA PCI IRQs
- */
-#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
-
-
diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/hardware.h b/trunk/arch/arm/mach-ixp4xx/include/mach/hardware.h
index 30ca67bf7093..72b75438f747 100644
--- 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
index 4bb6d6645563..5cb19fe10ed9 100644
--- 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
  */