From patchwork Fri Sep 14 21:34:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11433 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 BE51323E42 for ; Fri, 14 Sep 2012 21:35:35 +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 7E489A39283 for ; Fri, 14 Sep 2012 21:35:33 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so3512422iaf.11 for ; Fri, 14 Sep 2012 14:35:33 -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=WNdCBQ7Mww3VX7+b+8oJBLt2pjImJhWi5ym3eK1GAuQ=; b=inbOxFstzNbt+lRcfVXyFYKIfU8qZhPzMYib0SUW3EFvNGvKfZbHHQeDMMHPClSNF1 xjLhjSf4C0xQ7BX7Z5h9S6TP+elqRnn6QsMDCeqYnlM8IB+QkEVoJVxRpc/qZU+nby2Q Q51A7wI8zZb7qgC7BcQcgVT2ej92dkLJ1ItelF308dPLAatC8t5/67m3S8OKXs98BVql 5/hAGrAvpl7YwRMo7iM/dtPh7RhhqJiTbQAVO/LRfVznB86jgkIis+49s31E1MaqMq+o QhbliJRMWZmXtVpEbJKU00PRnxCIUxFAQHtmRZkN/o0ioVsDxWDmkVP0mcnlXe+WNZmz YP3Q== Received: by 10.42.84.69 with SMTP id k5mr3469808icl.5.1347658533293; Fri, 14 Sep 2012 14:35:33 -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 ex8csp215415igc; Fri, 14 Sep 2012 14:35:31 -0700 (PDT) Received: by 10.216.242.196 with SMTP id i46mr2040540wer.123.1347658531163; Fri, 14 Sep 2012 14:35:31 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.10]) by mx.google.com with ESMTP id u5si3559984weo.97.2012.09.14.14.35.30; Fri, 14 Sep 2012 14:35:31 -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 0LkjTw-1Tmnm41se4-00b3JP; Fri, 14 Sep 2012 23:35:24 +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 , Roland Stigge , Wolfram Sang Subject: [PATCH 11/24] ARM: lpc32xx: use __iomem pointers for MMIO Date: Fri, 14 Sep 2012 23:34:39 +0200 Message-Id: <1347658492-11608-12-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:/R78pjGOnM3PawmgQ22DgjQgKhQYiPgM0EM4GFqdljq hyhJOdCuOE0Oj+Y+WsHqUKsgBXQIgRqiueIdShPW5g4yc/PdpQ sdSkpU70c3dNz/oC4zozi3DmLyVgcx/+uZI9TjX4ccqiJLf1Ei CTnCEGyd1AuCa5NIqLRZKLzxLjG1cx4UokGRB1Kosmwjm3H+C8 9ufaZanpMSwd26zE/oDx/Zkk2Ty7yOQN2i5Mw+MZAK7SaVJcjS JsAVTtwV5A8SNIBNS7h1nvLOucPHJydAULNLE5QilAIyq4PMRY 14Mnjlj+ujQPGUe7OtZ7bRK8FKOARmRCqsVnZvdLAJMdf0zpsD L9/PbYlwo4SJI1vPrTAZh7yDVm25CR/b613+DtoQAJgByPJ+VM 6P/P5mUdJ4hRQ== X-Gm-Message-State: ALoCoQndh8rJvWGw6b399G3seqfGI0lLrDIpGhouc8MPcBerwgKh6pM/ua0jOyU9HKixo3oc7/iL ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. Cc: Roland Stigge Cc: Wolfram Sang Signed-off-by: Arnd Bergmann --- arch/arm/mach-lpc32xx/common.c | 8 ++++---- arch/arm/mach-lpc32xx/include/mach/hardware.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c index a48dc2d..0d4db8c 100644 --- a/arch/arm/mach-lpc32xx/common.c +++ b/arch/arm/mach-lpc32xx/common.c @@ -177,25 +177,25 @@ u32 clk_get_pclk_div(void) static struct map_desc lpc32xx_io_desc[] __initdata = { { - .virtual = IO_ADDRESS(LPC32XX_AHB0_START), + .virtual = (unsigned long)IO_ADDRESS(LPC32XX_AHB0_START), .pfn = __phys_to_pfn(LPC32XX_AHB0_START), .length = LPC32XX_AHB0_SIZE, .type = MT_DEVICE }, { - .virtual = IO_ADDRESS(LPC32XX_AHB1_START), + .virtual = (unsigned long)IO_ADDRESS(LPC32XX_AHB1_START), .pfn = __phys_to_pfn(LPC32XX_AHB1_START), .length = LPC32XX_AHB1_SIZE, .type = MT_DEVICE }, { - .virtual = IO_ADDRESS(LPC32XX_FABAPB_START), + .virtual = (unsigned long)IO_ADDRESS(LPC32XX_FABAPB_START), .pfn = __phys_to_pfn(LPC32XX_FABAPB_START), .length = LPC32XX_FABAPB_SIZE, .type = MT_DEVICE }, { - .virtual = IO_ADDRESS(LPC32XX_IRAM_BASE), + .virtual = (unsigned long)IO_ADDRESS(LPC32XX_IRAM_BASE), .pfn = __phys_to_pfn(LPC32XX_IRAM_BASE), .length = (LPC32XX_IRAM_BANK_SIZE * 2), .type = MT_DEVICE diff --git a/arch/arm/mach-lpc32xx/include/mach/hardware.h b/arch/arm/mach-lpc32xx/include/mach/hardware.h index 33e1dde..69065de 100644 --- a/arch/arm/mach-lpc32xx/include/mach/hardware.h +++ b/arch/arm/mach-lpc32xx/include/mach/hardware.h @@ -25,7 +25,7 @@ /* * This macro relies on fact that for all HW i/o addresses bits 20-23 are 0 */ -#define IO_ADDRESS(x) (((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\ +#define IO_ADDRESS(x) IOMEM(((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\ IO_BASE) #define io_p2v(x) ((void __iomem *) (unsigned long) IO_ADDRESS(x))