IXP4xx: move AVILA platform macros to the platform code.

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

diff --git a/arch/arm/mach-ixp4xx/avila-pci.c b/arch/arm/mach-ixp4xx/avila-pci.c
index 08d65dcdb5fe237b686963d180128ca7fd32d180..14df8cf49146f8ac2fe95f3f3d7ac84435c0da18 100644 (file)
--- a/arch/arm/mach-ixp4xx/avila-pci.c
+++ b/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/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c
index 797995ce18b9203155febaa89696392d9b981f61..6e558a76457d154a5aa38d0c816b720b062cdc82 100644 (file)
--- a/arch/arm/mach-ixp4xx/avila-setup.c
+++ b/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/arch/arm/mach-ixp4xx/include/mach/avila.h b/arch/arm/mach-ixp4xx/include/mach/avila.h
deleted file mode 100644 (file)
index 1640cb6..0000000
--- a/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/arch/arm/mach-ixp4xx/include/mach/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h
index 30ca67bf709323c677a091a47539b97c95121b81..72b75438f747b8ceb67e5c32e63ee7ce0e2cfbf0 100644 (file)
--- a/arch/arm/mach-ixp4xx/include/mach/hardware.h
+++ b/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/arch/arm/mach-ixp4xx/include/mach/irqs.h b/arch/arm/mach-ixp4xx/include/mach/irqs.h
index 4bb6d66455637af72da714b5093b9c2b06951152..5cb19fe10ed9854026166806d6fa4a21c6db6834 100644 (file)
--- a/arch/arm/mach-ixp4xx/include/mach/irqs.h
+++ b/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
  */