diff options
| -rw-r--r-- | arch/arm/include/asm/hardware/iop3xx.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-iop32x/include/mach/iop32x.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-iop33x/include/mach/iop33x.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-iop/pci.c | 3 |
4 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/include/asm/hardware/iop3xx.h b/arch/arm/include/asm/hardware/iop3xx.h index 4b8e7f559929..8d60ad267e3a 100644 --- a/arch/arm/include/asm/hardware/iop3xx.h +++ b/arch/arm/include/asm/hardware/iop3xx.h | |||
| @@ -215,6 +215,7 @@ extern int iop3xx_get_init_atu(void); | |||
| 215 | * IOP3XX I/O and Mem space regions for PCI autoconfiguration | 215 | * IOP3XX I/O and Mem space regions for PCI autoconfiguration |
| 216 | */ | 216 | */ |
| 217 | #define IOP3XX_PCI_LOWER_MEM_PA 0x80000000 | 217 | #define IOP3XX_PCI_LOWER_MEM_PA 0x80000000 |
| 218 | #define IOP3XX_PCI_MEM_WINDOW_SIZE 0x08000000 | ||
| 218 | 219 | ||
| 219 | #define IOP3XX_PCI_IO_WINDOW_SIZE 0x00010000 | 220 | #define IOP3XX_PCI_IO_WINDOW_SIZE 0x00010000 |
| 220 | #define IOP3XX_PCI_LOWER_IO_PA 0x90000000 | 221 | #define IOP3XX_PCI_LOWER_IO_PA 0x90000000 |
diff --git a/arch/arm/mach-iop32x/include/mach/iop32x.h b/arch/arm/mach-iop32x/include/mach/iop32x.h index abd9eb49f103..941f363aca56 100644 --- a/arch/arm/mach-iop32x/include/mach/iop32x.h +++ b/arch/arm/mach-iop32x/include/mach/iop32x.h | |||
| @@ -31,7 +31,5 @@ | |||
| 31 | #define IOP32X_MAX_RAM_SIZE 0x40000000UL | 31 | #define IOP32X_MAX_RAM_SIZE 0x40000000UL |
| 32 | #define IOP3XX_MAX_RAM_SIZE IOP32X_MAX_RAM_SIZE | 32 | #define IOP3XX_MAX_RAM_SIZE IOP32X_MAX_RAM_SIZE |
| 33 | #define IOP3XX_PCI_LOWER_MEM_BA 0x80000000 | 33 | #define IOP3XX_PCI_LOWER_MEM_BA 0x80000000 |
| 34 | #define IOP32X_PCI_MEM_WINDOW_SIZE 0x04000000 | ||
| 35 | #define IOP3XX_PCI_MEM_WINDOW_SIZE IOP32X_PCI_MEM_WINDOW_SIZE | ||
| 36 | 34 | ||
| 37 | #endif | 35 | #endif |
diff --git a/arch/arm/mach-iop33x/include/mach/iop33x.h b/arch/arm/mach-iop33x/include/mach/iop33x.h index 24567316ec88..a89c0a234bff 100644 --- a/arch/arm/mach-iop33x/include/mach/iop33x.h +++ b/arch/arm/mach-iop33x/include/mach/iop33x.h | |||
| @@ -36,8 +36,6 @@ | |||
| 36 | #define IOP33X_MAX_RAM_SIZE 0x80000000UL | 36 | #define IOP33X_MAX_RAM_SIZE 0x80000000UL |
| 37 | #define IOP3XX_MAX_RAM_SIZE IOP33X_MAX_RAM_SIZE | 37 | #define IOP3XX_MAX_RAM_SIZE IOP33X_MAX_RAM_SIZE |
| 38 | #define IOP3XX_PCI_LOWER_MEM_BA (PHYS_OFFSET + IOP33X_MAX_RAM_SIZE) | 38 | #define IOP3XX_PCI_LOWER_MEM_BA (PHYS_OFFSET + IOP33X_MAX_RAM_SIZE) |
| 39 | #define IOP33X_PCI_MEM_WINDOW_SIZE 0x08000000 | ||
| 40 | #define IOP3XX_PCI_MEM_WINDOW_SIZE IOP33X_PCI_MEM_WINDOW_SIZE | ||
| 41 | 39 | ||
| 42 | 40 | ||
| 43 | #endif | 41 | #endif |
diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index 77fa7cc7d162..ce31f316ac75 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c | |||
| @@ -257,7 +257,8 @@ void __init iop3xx_atu_setup(void) | |||
| 257 | *IOP3XX_OUMWTVR0 = 0; | 257 | *IOP3XX_OUMWTVR0 = 0; |
| 258 | 258 | ||
| 259 | /* Outbound window 1 */ | 259 | /* Outbound window 1 */ |
| 260 | *IOP3XX_OMWTVR1 = IOP3XX_PCI_LOWER_MEM_BA + IOP3XX_PCI_MEM_WINDOW_SIZE; | 260 | *IOP3XX_OMWTVR1 = IOP3XX_PCI_LOWER_MEM_BA + |
| 261 | IOP3XX_PCI_MEM_WINDOW_SIZE / 2; | ||
| 261 | *IOP3XX_OUMWTVR1 = 0; | 262 | *IOP3XX_OUMWTVR1 = 0; |
| 262 | 263 | ||
| 263 | /* BAR 3 ( Disabled ) */ | 264 | /* BAR 3 ( Disabled ) */ |
