Commit ec66969685ecf04e8a5036369702fa9aec07cc17
1 parent
9bf4d67689
Exists in
master
and in
4 other branches
IXP4xx: move AVILA platform macros to the platform code.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Showing 5 changed files with 18 additions and 51 deletions Side-by-side Diff
arch/arm/mach-ixp4xx/avila-pci.c
| ... | ... | @@ -22,11 +22,25 @@ |
| 22 | 22 | #include <linux/init.h> |
| 23 | 23 | #include <linux/irq.h> |
| 24 | 24 | #include <linux/delay.h> |
| 25 | - | |
| 26 | 25 | #include <asm/mach/pci.h> |
| 27 | 26 | #include <asm/irq.h> |
| 28 | 27 | #include <mach/hardware.h> |
| 29 | 28 | #include <asm/mach-types.h> |
| 29 | + | |
| 30 | +#define AVILA_PCI_MAX_DEV 4 | |
| 31 | +#define LOFT_PCI_MAX_DEV 6 | |
| 32 | +#define AVILA_PCI_IRQ_LINES 4 | |
| 33 | + | |
| 34 | +/* PCI controller GPIO to IRQ pin mappings */ | |
| 35 | +#define AVILA_PCI_INTA_PIN 11 | |
| 36 | +#define AVILA_PCI_INTB_PIN 10 | |
| 37 | +#define AVILA_PCI_INTC_PIN 9 | |
| 38 | +#define AVILA_PCI_INTD_PIN 8 | |
| 39 | + | |
| 40 | +#define IRQ_AVILA_PCI_INTA IRQ_IXP4XX_GPIO11 | |
| 41 | +#define IRQ_AVILA_PCI_INTB IRQ_IXP4XX_GPIO10 | |
| 42 | +#define IRQ_AVILA_PCI_INTC IRQ_IXP4XX_GPIO9 | |
| 43 | +#define IRQ_AVILA_PCI_INTD IRQ_IXP4XX_GPIO8 | |
| 30 | 44 | |
| 31 | 45 | void __init avila_pci_preinit(void) |
| 32 | 46 | { |
arch/arm/mach-ixp4xx/avila-setup.c
| ... | ... | @@ -19,7 +19,6 @@ |
| 19 | 19 | #include <linux/serial_8250.h> |
| 20 | 20 | #include <linux/slab.h> |
| 21 | 21 | #include <linux/i2c-gpio.h> |
| 22 | - | |
| 23 | 22 | #include <asm/types.h> |
| 24 | 23 | #include <asm/setup.h> |
| 25 | 24 | #include <asm/memory.h> |
| ... | ... | @@ -28,6 +27,9 @@ |
| 28 | 27 | #include <asm/irq.h> |
| 29 | 28 | #include <asm/mach/arch.h> |
| 30 | 29 | #include <asm/mach/flash.h> |
| 30 | + | |
| 31 | +#define AVILA_SDA_PIN 7 | |
| 32 | +#define AVILA_SCL_PIN 6 | |
| 31 | 33 | |
| 32 | 34 | static struct flash_platform_data avila_flash_data = { |
| 33 | 35 | .map_name = "cfi_probe", |
arch/arm/mach-ixp4xx/include/mach/avila.h
| 1 | -/* | |
| 2 | - * arch/arm/mach-ixp4xx/include/mach/avila.h | |
| 3 | - * | |
| 4 | - * Gateworks Avila platform specific definitions | |
| 5 | - * | |
| 6 | - * Author: Michael-Luke Jones <mlj28@cam.ac.uk> | |
| 7 | - * | |
| 8 | - * Based on ixdp425.h | |
| 9 | - * Author: Deepak Saxena <dsaxena@plexity.net> | |
| 10 | - * | |
| 11 | - * Copyright 2004 (c) MontaVista, Software, Inc. | |
| 12 | - * | |
| 13 | - * This file is licensed under the terms of the GNU General Public | |
| 14 | - * License version 2. This program is licensed "as is" without any | |
| 15 | - * warranty of any kind, whether express or implied. | |
| 16 | - */ | |
| 17 | - | |
| 18 | -#ifndef __ASM_ARCH_HARDWARE_H__ | |
| 19 | -#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 20 | -#endif | |
| 21 | - | |
| 22 | -#define AVILA_SDA_PIN 7 | |
| 23 | -#define AVILA_SCL_PIN 6 | |
| 24 | - | |
| 25 | -/* | |
| 26 | - * AVILA PCI IRQs | |
| 27 | - */ | |
| 28 | -#define AVILA_PCI_MAX_DEV 4 | |
| 29 | -#define LOFT_PCI_MAX_DEV 6 | |
| 30 | -#define AVILA_PCI_IRQ_LINES 4 | |
| 31 | - | |
| 32 | - | |
| 33 | -/* PCI controller GPIO to IRQ pin mappings */ | |
| 34 | -#define AVILA_PCI_INTA_PIN 11 | |
| 35 | -#define AVILA_PCI_INTB_PIN 10 | |
| 36 | -#define AVILA_PCI_INTC_PIN 9 | |
| 37 | -#define AVILA_PCI_INTD_PIN 8 |
arch/arm/mach-ixp4xx/include/mach/hardware.h
arch/arm/mach-ixp4xx/include/mach/irqs.h
| ... | ... | @@ -71,15 +71,6 @@ |
| 71 | 71 | #define XSCALE_PMU_IRQ (IRQ_IXP4XX_XSCALE_PMU) |
| 72 | 72 | |
| 73 | 73 | /* |
| 74 | - * Gateworks Avila board IRQs | |
| 75 | - */ | |
| 76 | -#define IRQ_AVILA_PCI_INTA IRQ_IXP4XX_GPIO11 | |
| 77 | -#define IRQ_AVILA_PCI_INTB IRQ_IXP4XX_GPIO10 | |
| 78 | -#define IRQ_AVILA_PCI_INTC IRQ_IXP4XX_GPIO9 | |
| 79 | -#define IRQ_AVILA_PCI_INTD IRQ_IXP4XX_GPIO8 | |
| 80 | - | |
| 81 | - | |
| 82 | -/* | |
| 83 | 74 | * PrPMC1100 Board IRQs |
| 84 | 75 | */ |
| 85 | 76 | #define IRQ_PRPMC1100_PCI_INTA IRQ_IXP4XX_GPIO11 |