Commit b2ad716b authored by Eli Carter's avatar Eli Carter Committed by Russell King

[ARM PATCH] 1511/1: iop321 #define cleanup

Patch from Eli Carter

# Mon Apr 21 11:20:06 CDT 2003 ejc@rnd-linux-c84
# pci-io-mem-size-defines
#
# Rename the IOP321_PCI_WINDOW_SIZE #defines to use
# IOP321_PCI_{IO,MEM}_{BASE,SIZE} instead.  This makes the #defines a bit more
# consistent.  No functional change, though it does bring up the question of
# whether res[].end should be BASE+SIZE-1 or BASE+SIZE.
#
# Diffed against linux-2.5.67-rmk1+1501-3+1506+1508-10
#
#  arch/arm/mach-iop3xx/iop321-pci.c    |    8 ++++----
#  include/asm-arm/arch-iop3xx/iop321.h |   10 ++++------
#  2 files changed, 8 insertions(+), 10 deletions(-)
#
parent cfa4a793
...@@ -212,13 +212,13 @@ int iop321_setup(int nr, struct pci_sys_data *sys) ...@@ -212,13 +212,13 @@ int iop321_setup(int nr, struct pci_sys_data *sys)
switch (nr) { switch (nr) {
case 0: case 0:
res[0].start = IOP321_PCI_LOWER_IO + 0x6e000000; res[0].start = IOP321_PCI_IO_BASE + 0x6e000000;
res[0].end = IOP321_PCI_LOWER_IO + 0x6e00ffff; res[0].end = IOP321_PCI_IO_BASE + IOP321_PCI_IO_SIZE-1 + 0x6e000000;
res[0].name = "PCI IO Primary"; res[0].name = "PCI IO Primary";
res[0].flags = IORESOURCE_IO; res[0].flags = IORESOURCE_IO;
res[1].start = IOP321_PCI_LOWER_MEM; res[1].start = IOP321_PCI_MEM_BASE;
res[1].end = IOP321_PCI_LOWER_MEM + IOP321_PCI_WINDOW_SIZE; res[1].end = IOP321_PCI_MEM_BASE + IOP321_PCI_MEM_SIZE;
res[1].name = "PCI Memory Primary"; res[1].name = "PCI Memory Primary";
res[1].flags = IORESOURCE_MEM; res[1].flags = IORESOURCE_MEM;
break; break;
......
...@@ -17,12 +17,10 @@ ...@@ -17,12 +17,10 @@
/* /*
* IOP321 I/O and Mem space regions for PCI autoconfiguration * IOP321 I/O and Mem space regions for PCI autoconfiguration
*/ */
#define IOP321_PCI_LOWER_IO 0x90000000 #define IOP321_PCI_IO_BASE 0x90000000
#define IOP321_PCI_UPPER_IO 0x9000ffff #define IOP321_PCI_IO_SIZE 0x00010000
#define IOP321_PCI_LOWER_MEM 0x80000000 #define IOP321_PCI_MEM_BASE 0x40000000
#define IOP321_PCI_UPPER_MEM 0x83ffffff #define IOP321_PCI_MEM_SIZE 0x40000000
#define IOP321_PCI_WINDOW_SIZE 64 * 0x100000
/* /*
* IOP321 chipset registers * IOP321 chipset registers
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment