aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/mach
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-07-09 22:59:03 -0400
committerRob Herring <rob.herring@calxeda.com>2012-07-26 10:09:17 -0400
commit3c5d1699887bfcd17e6d9842ba7e2b3234e665db (patch)
tree67704d14f9877622c305fee05ced1af7cee0654a /arch/arm/include/asm/mach
parentc2794437091a4fda72c4a4f3567dd728dcc0c3c9 (diff)
ARM: move PCI i/o resource setup into common code
With consolidation of the PCI i/o mappings, the i/o space is being set to start at a PCI bus addr of 0x0 and fixed to 64K per bus. In this case the core ARM PCI setup code can setup the i/o resource. Currently, the resource is only setup if the platform did not setup an i/o resource. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/asm/mach')
-rw-r--r--arch/arm/include/asm/mach/pci.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
index df818876fa31..db9fedb57f2c 100644
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
@@ -11,6 +11,7 @@
11#ifndef __ASM_MACH_PCI_H 11#ifndef __ASM_MACH_PCI_H
12#define __ASM_MACH_PCI_H 12#define __ASM_MACH_PCI_H
13 13
14#include <linux/ioport.h>
14 15
15struct pci_sys_data; 16struct pci_sys_data;
16struct pci_ops; 17struct pci_ops;
@@ -43,6 +44,8 @@ struct pci_sys_data {
43 unsigned long io_offset; /* bus->cpu IO mapping offset */ 44 unsigned long io_offset; /* bus->cpu IO mapping offset */
44 struct pci_bus *bus; /* PCI bus */ 45 struct pci_bus *bus; /* PCI bus */
45 struct list_head resources; /* root bus resources (apertures) */ 46 struct list_head resources; /* root bus resources (apertures) */
47 struct resource io_res;
48 char io_res_name[12];
46 /* Bridge swizzling */ 49 /* Bridge swizzling */
47 u8 (*swizzle)(struct pci_dev *, u8 *); 50 u8 (*swizzle)(struct pci_dev *, u8 *);
48 /* IRQ mapping */ 51 /* IRQ mapping */