aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-04-30 09:34:13 -0400
committerArnd Bergmann <arnd@arndb.de>2012-10-09 15:58:01 -0400
commitbfbad32a63fa6287723961f07bcd043dc9c5965c (patch)
treee8cb3ea67804a4d3c040f139cc6945483891f00d /arch/arm
parent782cd9ee985b1523f1ddad57657a24d7855d9e4d (diff)
ARM: pxa: armcore: fix PCI PIO warnings
The it8152 PCI host used on the pxa/cm_x2xx machines uses the old-style I/O window registration. This should eventually get converted to pci_ioremap_io() but for now, let's cast the IT8152_IO_BASE constant to an integer type to get rid of the warnings. Without this patch, building cm_x2xx_defconfig results in: arch/arm/common/it8152.c: In function 'it8152_pci_setup': arch/arm/common/it8152.c:287:18: warning: assignment makes integer from pointer without a cast [enabled by default] arch/arm/common/it8152.c:288:16: warning: assignment makes integer from pointer without a cast [enabled by default] arch/arm/common/it8152.c:291:17: warning: assignment makes integer from pointer without a cast [enabled by default] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Krzysztof Halasa <khc@pm.waw.pl> Cc: Mike Rapoport <mike@compulab.co.il> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/common/it8152.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
index c4110d1b1f2d..001f4913799c 100644
--- a/arch/arm/common/it8152.c
+++ b/arch/arm/common/it8152.c
@@ -284,11 +284,17 @@ int dma_set_coherent_mask(struct device *dev, u64 mask)
284 284
285int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) 285int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)
286{ 286{
287 it8152_io.start = IT8152_IO_BASE + 0x12000; 287 /*
288 it8152_io.end = IT8152_IO_BASE + 0x12000 + 0x100000; 288 * FIXME: use pci_ioremap_io to remap the IO space here and
289 * move over to the generic io.h implementation.
290 * This requires solving the same problem for PXA PCMCIA
291 * support.
292 */
293 it8152_io.start = (unsigned long)IT8152_IO_BASE + 0x12000;
294 it8152_io.end = (unsigned long)IT8152_IO_BASE + 0x12000 + 0x100000;
289 295
290 sys->mem_offset = 0x10000000; 296 sys->mem_offset = 0x10000000;
291 sys->io_offset = IT8152_IO_BASE; 297 sys->io_offset = (unsigned long)IT8152_IO_BASE;
292 298
293 if (request_resource(&ioport_resource, &it8152_io)) { 299 if (request_resource(&ioport_resource, &it8152_io)) {
294 printk(KERN_ERR "PCI: unable to allocate IO region\n"); 300 printk(KERN_ERR "PCI: unable to allocate IO region\n");