From patchwork Tue Oct 9 15:34:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12077 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 0D21D23F6D for ; Tue, 9 Oct 2012 15:34:36 +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 A46E6A18CF0 for ; Tue, 9 Oct 2012 15:34:35 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so11504949iej.11 for ; Tue, 09 Oct 2012 08:34:35 -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=6mVLGCdVguh3+wpR/ed6RHP4yTGdAqX1w8BB0q+5oA8=; b=n9p4c13xgal45LQW5CoYkoO9iW2OcelMxz8RvkRBrE41XP2BCu98VP9QlLS7JkoZDQ kEH/Eazd0VD2rEoSIKD2mJIX8ylTofevlkpNk7FHkGgi9nyiMVecHH2FXa1ilQehpcWD vRn8VSBPjhuLrvNEckZpbQWrxaDOIcq95UrydVzZxpblotF00Um+pW38ucBraDSBsBRx oekbiO1NG2Nqzmpzexb392VfhfyT/7Xi0Fo6bCfHRvF9hTkx63D555fl+xLQWn0YUGIA +acaVP4iuTydeEZ4Ozt1wJKxaBpHMd4NcuvG87Vb1G96ko4VBLv1Dqn9qznEYM+8RTVO O7Qw== Received: by 10.50.87.134 with SMTP id ay6mr2048928igb.70.1349796875403; Tue, 09 Oct 2012 08:34:35 -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.67.148 with SMTP id n20csp74681igt; Tue, 9 Oct 2012 08:34:34 -0700 (PDT) Received: by 10.216.136.72 with SMTP id v50mr11522436wei.203.1349796873733; Tue, 09 Oct 2012 08:34:33 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.8]) by mx.google.com with ESMTPS id i14si26136733wiw.43.2012.10.09.08.34.33 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 08:34:33 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.8; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.8 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=mreu1) with ESMTP (Nemesis) id 0MOmdm-1TGfsl2bVG-0068ly; Tue, 09 Oct 2012 17:34:25 +0200 From: Arnd Bergmann To: arm@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Linus Walleij , Russell King Subject: [PATCH 3/3] ARM: integrator: use __iomem pointers for MMIO, part 2 Date: Tue, 9 Oct 2012 17:34:21 +0200 Message-Id: <1349796861-31164-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349796861-31164-1-git-send-email-arnd@arndb.de> References: <1349796861-31164-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:pxlkrFaTYa2T+ZsQh7C+flm0iB2YyiDvBxKHVW0el3a oOeZChG4+EdiaPb2SrPrmps5czm1rTEnu3pKAKqlEZw1bPwbQV tzmTsnRBCjIDPCs5EOmjarfD8GcqjtW9MTrsJvOawXttyzR0N5 fVKyRnwxEFBPfSFB8iKcD9G7qKFKgABG0R7H10HJjopPSCkfty 9AJVjxeHfi3Kp7Udu/6hDoNAk6YsNTgFo/3XbbJcdxdW+4Bkek B9KC3nGNbH7XeJXuMvs+Yjf3RpIINsoS3smK8hNXTzivJ/+97h m5z5+85eSTy91W467md7lAXsc6utuI+WZsf1jv5fZ47WDEYrxg UkbQJPs2NPbHoV6EcJHtep1U0/wOk6zZm0J7s3Lli39E0OWq4d v632jMUoeAJL9A3475G5Fpek1jFiVtEbAw= X-Gm-Message-State: ALoCoQkEAZX+0tN3GFHQ7Km82+uHAeclUzQUek3E6lE/ZmN44f/zl0YOVtdvs2ZXAbboFggpKyAM Due to some interesting merges in the integrator code, not all users of mmio pointers were converted before, this fixes all warnings that got introduced as a consequence. Signed-off-by: Arnd Bergmann Cc: Linus Walleij Cc: Russell King --- arch/arm/mach-integrator/include/mach/cm.h | 2 +- arch/arm/mach-integrator/include/mach/platform.h | 6 +++--- arch/arm/mach-integrator/integrator_ap.c | 2 +- arch/arm/mach-integrator/integrator_cp.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-integrator/include/mach/cm.h b/arch/arm/mach-integrator/include/mach/cm.h index 1a78692e..202e6a5 100644 --- a/arch/arm/mach-integrator/include/mach/cm.h +++ b/arch/arm/mach-integrator/include/mach/cm.h @@ -3,7 +3,7 @@ */ void cm_control(u32, u32); -#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL) +#define CM_CTRL __io_address(INTEGRATOR_HDR_CTRL) #define CM_CTRL_LED (1 << 0) #define CM_CTRL_nMBDET (1 << 1) diff --git a/arch/arm/mach-integrator/include/mach/platform.h b/arch/arm/mach-integrator/include/mach/platform.h index 4c03475..efeac5d 100644 --- a/arch/arm/mach-integrator/include/mach/platform.h +++ b/arch/arm/mach-integrator/include/mach/platform.h @@ -324,9 +324,9 @@ */ #define PHYS_PCI_V3_BASE 0x62000000 -#define PCI_MEMORY_VADDR 0xe8000000 -#define PCI_CONFIG_VADDR 0xec000000 -#define PCI_V3_VADDR 0xed000000 +#define PCI_MEMORY_VADDR IOMEM(0xe8000000) +#define PCI_CONFIG_VADDR IOMEM(0xec000000) +#define PCI_V3_VADDR IOMEM(0xed000000) /* ------------------------------------------------------------------------ * Integrator Interrupt Controllers diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index d5b5435a..e6617c1 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -157,7 +157,7 @@ static struct map_desc ap_io_desc[] __initdata = { static void __init ap_map_io(void) { iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc)); - vga_base = PCI_MEMORY_VADDR; + vga_base = (unsigned long)PCI_MEMORY_VADDR; pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE)); } diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 6870a1f..5b08e8e 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -261,6 +261,8 @@ static void __init intcp_init_early(void) #endif } +#ifdef CONFIG_OF + static void __init intcp_timer_init_of(void) { struct device_node *node; @@ -297,8 +299,6 @@ static struct sys_timer cp_of_timer = { .init = intcp_timer_init_of, }; -#ifdef CONFIG_OF - static const struct of_device_id fpga_irq_of_match[] __initconst = { { .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, }, { /* Sentinel */ }