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: 1553561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 4500E3FCFC for ; Fri, 5 Oct 2012 14:58:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TK9KH-0003gw-2U; Fri, 05 Oct 2012 14:56:29 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TK9Jl-0003b4-OB for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2012 14:55:59 +0000 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 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-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Eric Miao , Arnd Bergmann , linux-kernel@vger.kernel.org, Haojian Zhuang , arm@kernel.org, Igor Grinberg , Mike Rapoport , Bjorn Helgaas , Krzysztof Halasa X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 Acked-by: Igor Grinberg --- 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");