From e4b293651d3e461ef80d7c56710d7d0c1a2b03b8 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 26 Mar 2008 18:44:58 -0700 Subject: [PATCH] --- yaml --- r: 91155 b: refs/heads/master c: 27eedbf557f511efbe5651fa2fbfa0e4e8315ab7 h: refs/heads/master i: 91153: e8a0da81b6d8df64cea6e042c39729bc0075eaef 91151: e2bd8d56bad37c77258918cc21a0341f887387b9 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-iop/pci.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2421645da278..86dde5c39df8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3a1c9c75b986e5a2c5d878ef0700a1ca6bb895a +refs/heads/master: 27eedbf557f511efbe5651fa2fbfa0e4e8315ab7 diff --git a/trunk/arch/arm/plat-iop/pci.c b/trunk/arch/arm/plat-iop/pci.c index 9e83066cc056..ee6deaabf9b5 100644 --- a/trunk/arch/arm/plat-iop/pci.c +++ b/trunk/arch/arm/plat-iop/pci.c @@ -209,8 +209,11 @@ int iop3xx_pci_setup(int nr, struct pci_sys_data *sys) res[1].flags = IORESOURCE_MEM; request_resource(&iomem_resource, &res[1]); - sys->mem_offset = IOP3XX_PCI_LOWER_MEM_PA - IOP3XX_PCI_LOWER_MEM_BA; - sys->io_offset = IOP3XX_PCI_LOWER_IO_PA - IOP3XX_PCI_LOWER_IO_BA; + /* + * Use whatever translation is already setup. + */ + sys->mem_offset = IOP3XX_PCI_LOWER_MEM_PA - *IOP3XX_OMWTVR0; + sys->io_offset = IOP3XX_PCI_LOWER_IO_PA - *IOP3XX_OIOWTVR; sys->resource[0] = &res[0]; sys->resource[1] = &res[1];