diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/arm/mach-ixp4xx/include/mach/hardware.h | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/arm/mach-ixp4xx/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/hardware.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h index 8138371c406e..c30e7e923a73 100644 --- a/arch/arm/mach-ixp4xx/include/mach/hardware.h +++ b/arch/arm/mach-ixp4xx/include/mach/hardware.h | |||
| @@ -17,19 +17,14 @@ | |||
| 17 | #ifndef __ASM_ARCH_HARDWARE_H__ | 17 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 18 | #define __ASM_ARCH_HARDWARE_H__ | 18 | #define __ASM_ARCH_HARDWARE_H__ |
| 19 | 19 | ||
| 20 | #define PCIBIOS_MIN_IO 0x00001000 | ||
| 21 | #ifdef CONFIG_IXP4XX_INDIRECT_PCI | 20 | #ifdef CONFIG_IXP4XX_INDIRECT_PCI |
| 22 | #define PCIBIOS_MIN_MEM 0x10000000 /* 1 GB of indirect PCI MMIO space */ | ||
| 23 | #define PCIBIOS_MAX_MEM 0x4FFFFFFF | 21 | #define PCIBIOS_MAX_MEM 0x4FFFFFFF |
| 24 | #else | 22 | #else |
| 25 | #define PCIBIOS_MIN_MEM 0x48000000 /* 64 MB of PCI MMIO space */ | ||
| 26 | #define PCIBIOS_MAX_MEM 0x4BFFFFFF | 23 | #define PCIBIOS_MAX_MEM 0x4BFFFFFF |
| 27 | #endif | 24 | #endif |
| 28 | 25 | ||
| 29 | #define ARCH_HAS_DMA_SET_COHERENT_MASK | 26 | #define ARCH_HAS_DMA_SET_COHERENT_MASK |
| 30 | 27 | ||
| 31 | #define pcibios_assign_all_busses() 1 | ||
| 32 | |||
| 33 | /* Register locations and bits */ | 28 | /* Register locations and bits */ |
| 34 | #include "ixp4xx-regs.h" | 29 | #include "ixp4xx-regs.h" |
| 35 | 30 | ||