summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-12-14 00:18:19 +0100
committerWolfgang Denk <wd@denx.de>2010-12-14 00:18:19 +0100
commitf8689b9eb3a7f6925cd50404a12479889188c510 (patch)
treef85cf7d47e12cb7d11adc4ccd07c1d405c61010c /arch
parent63440c4a80cef3dafdb931a7f914dc6b53eb27e4 (diff)
parent054289f752371533285ae709003a683e6964f88f (diff)
downloadu-boot-imx-f8689b9eb3a7f6925cd50404a12479889188c510.zip
u-boot-imx-f8689b9eb3a7f6925cd50404a12479889188c510.tar.gz
u-boot-imx-f8689b9eb3a7f6925cd50404a12479889188c510.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/cpu/mpc83xx/pcie.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 1771c48..46a706d 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -201,18 +201,18 @@ static void mpc83xx_pcie_init_bus(int bus, struct pci_region *reg)
out_le32(&out_win->tarl, 0);
out_le32(&out_win->tarh, 0);
- for (i = 0; i < 2; i++, reg++) {
+ for (i = 0; i < 2; i++) {
u32 ar;
- if (reg->size == 0)
+ if (reg[i].size == 0)
break;
out_win = &pex->bridge.pex_outbound_win[i + 1];
- out_le32(&out_win->bar, reg->phys_start);
- out_le32(&out_win->tarl, reg->bus_start);
+ out_le32(&out_win->bar, reg[i].phys_start);
+ out_le32(&out_win->tarl, reg[i].bus_start);
out_le32(&out_win->tarh, 0);
- ar = PEX_OWAR_EN | (reg->size & PEX_OWAR_SIZE);
- if (reg->flags & PCI_REGION_IO)
+ ar = PEX_OWAR_EN | (reg[i].size & PEX_OWAR_SIZE);
+ if (reg[i].flags & PCI_REGION_IO)
ar |= PEX_OWAR_TYPE_IO;
else
ar |= PEX_OWAR_TYPE_MEM;