From patchwork Fri Sep 14 21:34:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11429 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 C94F423E42 for ; Fri, 14 Sep 2012 21:35:31 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 5F746A39263 for ; Fri, 14 Sep 2012 21:35:29 +0000 (UTC) Received: by iafj25 with SMTP id j25so3512531iaf.11 for ; Fri, 14 Sep 2012 14:35:29 -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=slSBL/W3S02aOVx8eDehg9mZtGnsvNR2x7nFqcs92+4=; b=fEXx/VEGsqEit05BK5PL5z58dXB2L6q7VrfFsr8gZYjH2LaxT7TqFbbUAaUvKSWiSs a9V+jW6cyrET5d2eNeUywd1pAA6S4oF18neogjkZgF6GLvzNt949eSsUaOahQFJX11pT tKp4qsh7nvIQjygky7W5NdYVAIwNQOBZRzhOMp9Wr8je0TXOXijq+4o2cx7xfVzYEceB gf6xQxRQEnGVo1+yGCLLdhUHWLG1CHdwRHQSKeSZjTOT6sENCb/xUi5GnP4UXwR6dgoP 8WN6pKEas9UJr47gP/uC7RrWJjyDIFLysV1967l7BCjErkydqi9JQBDf5L80MSzu5iT5 fxeg== Received: by 10.50.89.164 with SMTP id bp4mr120768igb.28.1347658529152; Fri, 14 Sep 2012 14:35:29 -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 ex8csp215404igc; Fri, 14 Sep 2012 14:35:28 -0700 (PDT) Received: by 10.204.7.199 with SMTP id e7mr2166536bke.125.1347658527723; Fri, 14 Sep 2012 14:35:27 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.10]) by mx.google.com with ESMTP id fy11si4079713bkc.58.2012.09.14.14.35.27; Fri, 14 Sep 2012 14:35:27 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.10 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.10; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.10 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0Lyk6B-1TYpIY45CR-015acu; Fri, 14 Sep 2012 23:35:26 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Will Deacon , Russell King , Nicolas Pitre , Arnd Bergmann , Jochen Friedrich , Dominik Brodowski Subject: [PATCH 15/24] ARM: sa1100: use __iomem pointers for MMIO Date: Fri, 14 Sep 2012 23:34:43 +0200 Message-Id: <1347658492-11608-16-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1347658492-11608-1-git-send-email-arnd@arndb.de> References: <1347658492-11608-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:0LvK15tmXfFYHthTW3ShVJt1cq9x2mt/rN7nSwcEN3z UL/kQdFmYcGgMp2/e+ODL7UOGiqm8PvQNkyKZhiBVMpRb65ezt 7Yt1Dw+7mlPJHnczzu8YjzWOakRNKyfGBGbSCGmm8679a58bxg N0H+djI9o2URg8nbWsPuP39i7gL3c/RziqyfguDyk3+yQ+8WJL d9T57cbzYXUwhqPQW+DjkObre+f8VJoJB2kfhJuXSmJt0t7+No N1IoNPZRciZBXveEqL0Rrh8oX73vpKEjl8LhjkZueWz7oCbjGD VZw3yFnVeBawZjS2HnJjdZrBITX/lhMQ3Kiq25zac2fTx4u0a3 wjhDZ1F923guKScRY7IWC8Y70CnxqMl8ds5wz6984cW5e52NED p4QMXD1rJhR6w== X-Gm-Message-State: ALoCoQl1jWrXAfqlUcn0DTUhJV5mw2hRcxMr2fOuP6DTjSY7jWKoWNFbK0XgKookNSEeYwDGZ6ks ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. Cc: Jochen Friedrich Cc: Dominik Brodowski Signed-off-by: Arnd Bergmann --- arch/arm/mach-sa1100/include/mach/simpad.h | 2 +- arch/arm/mach-sa1100/simpad.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-sa1100/include/mach/simpad.h b/arch/arm/mach-sa1100/include/mach/simpad.h index cdea671..ac2ea76 100644 --- a/arch/arm/mach-sa1100/include/mach/simpad.h +++ b/arch/arm/mach-sa1100/include/mach/simpad.h @@ -87,7 +87,7 @@ #define SIMPAD_CS3_PCMCIA_SHORT (SIMPAD_CS3_GPIO_BASE + 22) #define SIMPAD_CS3_GPIO_23 (SIMPAD_CS3_GPIO_BASE + 23) -#define CS3_BASE 0xf1000000 +#define CS3_BASE IOMEM(0xf1000000) long simpad_get_cs3_ro(void); long simpad_get_cs3_shadow(void); diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index fbd5359..6ca92d0 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c @@ -124,7 +124,7 @@ static struct map_desc simpad_io_desc[] __initdata = { .length = 0x00800000, .type = MT_DEVICE }, { /* Simpad CS3 */ - .virtual = CS3_BASE, + .virtual = (unsigned long)CS3_BASE, .pfn = __phys_to_pfn(SA1100_CS3_PHYS), .length = 0x00100000, .type = MT_DEVICE