summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Hintz <nlhintz@hotmail.com>2012-05-04 21:56:33 -0700
committerJohn W. Linville <linville@tuxdriver.com>2012-05-16 12:46:04 -0400
commit4acabf454ac3def5b3716576f77d4b9da272864d (patch)
tree5d0a5580ccbf8bbf2c542b388ad3869b987dbacc
parent5fe2e0711dd9286e46f60f21c8cd580242cf8f89 (diff)
downloadlinux-3.10-4acabf454ac3def5b3716576f77d4b9da272864d.tar.gz
linux-3.10-4acabf454ac3def5b3716576f77d4b9da272864d.tar.bz2
linux-3.10-4acabf454ac3def5b3716576f77d4b9da272864d.zip
bcma: Account for variable PCI memory base/size
PCI Memory Resource start address and size are variable, dependent on the H/W configuration. Modify the computation of io_map_base to use the computed values. Signed-off-by: Nathan Hintz <nlhintz@hotmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/bcma/driver_pci_host.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c
index d2097a11c3c..8407b25984a 100644
--- a/drivers/bcma/driver_pci_host.c
+++ b/drivers/bcma/driver_pci_host.c
@@ -491,8 +491,8 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
/* Ok, ready to run, register it to the system.
* The following needs change, if we want to port hostmode
* to non-MIPS platform. */
- io_map_base = (unsigned long)ioremap_nocache(BCMA_SOC_PCI_MEM,
- 0x04000000);
+ io_map_base = (unsigned long)ioremap_nocache(pc_host->mem_resource.start,
+ resource_size(&pc_host->mem_resource));
pc_host->pci_controller.io_map_base = io_map_base;
set_io_port_base(pc_host->pci_controller.io_map_base);
/* Give some time to the PCI controller to configure itself with the new