From patchwork Fri Oct 5 14:55:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12011 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3D73623E57 for ; Fri, 5 Oct 2012 14:56:03 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id C1055A190DC for ; Fri, 5 Oct 2012 14:56:02 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so3893159iej.11 for ; Fri, 05 Oct 2012 07:56:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=FFSMj0siCO5I9ieP18zVKovFBES2zMm7997dG/YfXoc=; b=hRzuB708VvYTeAHZ7qw/1wuD+i4EBirQkbvUjpzOe09NFCivlZRVurycZD9Psan26K C4Cn9JdAi7V/h//y0Udx0FhMMadyl1Mefvi4xJwOzz+Ntho1ulvKvH7K+6+/x3Ad1eLf iYfSYoSorMKATS2EoYDkwBt5VbpUynIooO+WWhaPIoOyH14jRKoJ4eCMm5mpHF60HZdi YHAjmy0sIyOcgPyGFaI1p9sfovhOTvtJawhq1suh7a+G+hkWBNekkW4a6+vStbaWy78c oTyU120ZU47L7UeJEh4G7EOEki8O4XI4/YIXcObyaZaM2GhiePBi42tCAsrh9LBdYz5M bNGw== Received: by 10.50.178.40 with SMTP id cv8mr1447095igc.0.1349448962049; Fri, 05 Oct 2012 07:56:02 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp130616igc; Fri, 5 Oct 2012 07:56:01 -0700 (PDT) Received: by 10.181.13.208 with SMTP id fa16mr3937514wid.11.1349448960416; Fri, 05 Oct 2012 07:56:00 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.187]) by mx.google.com with ESMTPS id n11si2932775wiw.6.2012.10.05.07.55.59 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 07:56:00 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.187; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0M6K9X-1TdScH2hDP-00yQkJ; Fri, 05 Oct 2012 16:55:51 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, arm@kernel.org, Arnd Bergmann , Bjorn Helgaas , Krzysztof Halasa , Mike Rapoport , Igor Grinberg , Haojian Zhuang , Eric Miao Subject: [PATCH 14/16] ARM: pxa: armcore: fix PCI PIO warnings Date: Fri, 5 Oct 2012 16:55:28 +0200 Message-Id: <1349448930-23976-15-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349448930-23976-1-git-send-email-arnd@arndb.de> References: <1349448930-23976-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:UafO81VGNPEyXx9j+7dMuX0tKIkuxKmzg8Ieoa5rmeo uhEYMEMi5wfURsFitGVPF+lz/oJ/83ZpgaGcEet04H1vWKejnP +HoGXqToYD8ml4Rsrm2fDiek3rNPvNR2W/XdZ60tUtupLFSrU8 nPpa+bR/2nUmcYrx5dyrh/V9OhU83GKc9K8vSmpMqm7WiLyRs1 6GCFLOjovuUH2vSsaBH0GlDUt732pzEY/xWPAOtV38ML0VBFK2 uCt7i8CDYcznCoqtIWtfJg9oK71azEV+5gLaLdpGeFwYmxIZqr Ux1odSICVGwQhVCo42L4U6GxyyogAKSrjZPr3Nu3W9yTF9QTJ0 o4x62sngQDMVKHSpxLBp1KHvibbnNJA4JXg43K2SKQVj7Z4NBF T24Q4pc3/IsZNxwdjzO4eaSgk33OycwAig= X-Gm-Message-State: ALoCoQn7haCdL9tVcfEKcdqxv3gkiSbicHdjgUXLLip7tMHGGAUnapQVizpilN7k64QDyRp8yQKv 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 Cc: Bjorn Helgaas Cc: Krzysztof Halasa Cc: Mike Rapoport Cc: Igor Grinberg Cc: Haojian Zhuang Cc: Eric Miao --- arch/arm/common/it8152.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c index c4110d1..001f491 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) 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");