---

yaml --- r: 333311 b: refs/heads/master c: bfbad32 h: refs/heads/master i: 333309: 3ac5c42 333307: 267a641 333303: 5970963 333295: 87b12da 333279: 23a2919 333247: 385c10f 333183: dd62275 333055: ab37790 332799: 839ad0a v: v3
git-mirror · Oct 9, 2012 · d65f6f0 · d65f6f0
1 parent 9f938ba
commit d65f6f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 782cd9ee985b1523f1ddad57657a24d7855d9e4d
+refs/heads/master: bfbad32a63fa6287723961f07bcd043dc9c5965c
diff --git a/trunk/arch/arm/common/it8152.c b/trunk/arch/arm/common/it8152.c
@@ -284,11 +284,17 @@ int dma_set_coherent_mask(struct device *dev, u64 mask)
 
 int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)
 {
-	it8152_io.start = IT8152_IO_BASE + 0x12000;
-	it8152_io.end	= IT8152_IO_BASE + 0x12000 + 0x100000;
+	/*
+	 * FIXME: use pci_ioremap_io to remap the IO space here and
+	 * move over to the generic io.h implementation.
+	 * This requires solving the same problem for PXA PCMCIA
+	 * support.
+	 */
+	it8152_io.start = (unsigned long)IT8152_IO_BASE + 0x12000;
+	it8152_io.end	= (unsigned long)IT8152_IO_BASE + 0x12000 + 0x100000;
 
 	sys->mem_offset = 0x10000000;
-	sys->io_offset  = IT8152_IO_BASE;
+	sys->io_offset  = (unsigned long)IT8152_IO_BASE;
 
 	if (request_resource(&ioport_resource, &it8152_io)) {
 		printk(KERN_ERR "PCI: unable to allocate IO region\n");