From patchwork Tue Oct 9 20:01:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1571331 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 6A0D83FE80 for ; Tue, 9 Oct 2012 20:04:04 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TLfzn-0007e3-Mi; Tue, 09 Oct 2012 20:01:39 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TLfzj-0007dp-UG for linux-arm-kernel@lists.infradead.org; Tue, 09 Oct 2012 20:01:36 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0LfFYi-1TjnTH0HlI-00pKAy; Tue, 09 Oct 2012 22:01:31 +0200 From: Arnd Bergmann To: Olof Johansson Subject: Re: [PATCH 0/3] new ARM-soc warning fixes Date: Tue, 9 Oct 2012 20:01:26 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <1349796861-31164-1-git-send-email-arnd@arndb.de> <20121009174631.GA19606@quad.lixom.net> In-Reply-To: <20121009174631.GA19606@quad.lixom.net> MIME-Version: 1.0 Message-Id: <201210092001.26947.arnd@arndb.de> X-Provags-ID: V02:K0:rgt5fgv8/N1lEgAfooEWcBAgC2nedIvNwlG9RE+lHwe hWHy+GykL7ZAzIUKI/PKtz/n9s3Kee9KHplu0UlQVOVctAVhyj YMkfxb74eLwtnp+TAJ2ZcX5asXAUWgPwEddQ694aYS1UcOZvul wXPBi8vzV3IVThu0rnwvFIdOQfcj7CvgEeC7bBoSod3HhzaiuF xA2RzpaSGQi7/3w3NJ5nsvC/rIfbUSo85BFR/z1GEjwCrjmTPm M8WE41h6AB5V6/ya5M0ykfgDlyLq+Q9q55OnoQjH2kgp0F4G1f +5BQ4AE8bBnal7/3c4zPzU6VLvBFIfloF4BENnBquL65HcyeNu R26Yos3/rUiW4sjx3I20= 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.17.10 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: Simon Horman , Linus Walleij , linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Magnus Damm , arm@kernel.org, Russell King , linux-arm-kernel@lists.infradead.org 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Tuesday 09 October 2012, Olof Johansson wrote: > On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote: > > Hi Olof, > > > > Here are three more fixes that I'd like to merge through the arm-soc > > as time permits. All of them should be completely harmless and they > > only fix harmless gcc warnings. > > > > I don't know what your plans are for sending the next fixes branch. > > I've uploaded these into a new "fixes2" branch on top of the patches > > that are already in "fixes". We can either send them all together, > > or you send the ones that are already queued first and these ones > > with the next batch. Feel free to rebase if necessary. > > I've pulled it in and will send up with fixes tonight (Tony has OMAP > fixes coming, others might too). > Ok, thanks! I just noticed that I was missing yet another one, which I now added directly. It was part of a longer series I sent last week. I wasn't really sure whether this one would better be included in arm-soc or Russell's arm tree and then I ended up not putting it in either series :( Arnd 8<---------- From bfbad32a63fa6287723961f07bcd043dc9c5965c Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 30 Apr 2012 13:34:13 +0000 Subject: [PATCH] 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 Acked-by: Igor Grinberg Cc: Bjorn Helgaas Cc: Krzysztof Halasa Cc: Mike Rapoport Cc: Haojian Zhuang Cc: Eric Miao 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");