From patchwork Fri Sep 14 21:34:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11427 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 BB69423E42 for ; Fri, 14 Sep 2012 21:35:27 +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 DA0B8A39251 for ; Fri, 14 Sep 2012 21:35:26 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so3512422iaf.11 for ; Fri, 14 Sep 2012 14:35:26 -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=m/PhcIne+8RCBu1Xe22KzetYSYU8L6boj/X8kj9ObVY=; b=ElEStIF6pLmUBEmabKA1jXlR4SOTf88z43IeHXjO36KDOCnAPcf/AY9bo4/94qIbjL RRHUn+xqsMy3Hd0j7Rb1THhRqHlEiIwA0VZ9A3cQW9Yng0uNW5MsgLJBgLs5QhaNPPtu GXjfERmfcq4pqazpja3gxzPCE7WZO1GaarH1rmTC9aaGB/XgB8rdbjnrBvAoYer2yXut CNYE7Fmxc+/7p22ATKH2ZPdELjZ7B/EwNQgLJCas6DUofQWRdxlpo/JSUgfeHn99vv5e dE6Lag8bNykTwqDvDqReO7tVbSAVe3a7nHXQsLZiPN8uInjHJCAX5xO/hIoI2+IVbtQN lspA== Received: by 10.50.207.106 with SMTP id lv10mr149282igc.0.1347658526520; Fri, 14 Sep 2012 14:35:26 -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 ex8csp215400igc; Fri, 14 Sep 2012 14:35:25 -0700 (PDT) Received: by 10.204.130.151 with SMTP id t23mr2211874bks.94.1347658525178; Fri, 14 Sep 2012 14:35:25 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.10]) by mx.google.com with ESMTP id gk4si4086228bkc.15.2012.09.14.14.35.24; Fri, 14 Sep 2012 14:35:25 -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 0LmNdq-1Tl9573QkE-00ZOcL; 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 , Krzysztof Halasa Subject: [PATCH 10/24] ARM: ks8695: use __iomem pointers for MMIO Date: Fri, 14 Sep 2012 23:34:38 +0200 Message-Id: <1347658492-11608-11-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:ogbyh9VSZk1u9lj5Iy/cJwKzvsBNRzM84kNMj5+nZgC bp58O/FDwai5PZbaEcPmR5fNKf9p9qtg/JuREcXYHGTSYGHY8z qwZl6/d8Bbuy1dK5GKrrnDsF2BlyZa7L28/FzkZlvcFaEHGhCU 5hxz1F0jKYlPVloq+WGReOlnYjBxX127z/u2+9cwhvCfcqFNPG u7A+b+iceCGRgXzhVtmIaPyVP6Z+jW8qwO1ofeII/0MzkU3L6o Af/jWdo96TLHhH6YsMsaDeujYROW04bN6TFn8Y4oSXfafWwpTC FC43w8nj7ItdQeuWbzayTPkLlVLXCod+l3mWKLzNcYZPgGJAwY 2EmVqYG4hA1blNqnIroRCECYOXb7VgVxMIxEHmQZU61BPfYcYN ahhnHZbxsf0pg== X-Gm-Message-State: ALoCoQmhOxNsTC0H/fA0EmTI6Ho8Jsj1ETsc7Lo72isQkKZCiYBMMKLDV4U13H2uklqT1Es5GdhS ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. Cc: Krzysztof Halasa Signed-off-by: Arnd Bergmann --- arch/arm/mach-ks8695/cpu.c | 2 +- arch/arm/mach-ks8695/include/mach/hardware.h | 2 +- arch/arm/mach-ks8695/include/mach/uncompress.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-ks8695/cpu.c b/arch/arm/mach-ks8695/cpu.c index 7f3f240..ddb2422 100644 --- a/arch/arm/mach-ks8695/cpu.c +++ b/arch/arm/mach-ks8695/cpu.c @@ -36,7 +36,7 @@ static struct __initdata map_desc ks8695_io_desc[] = { { - .virtual = KS8695_IO_VA, + .virtual = (unsigned long)KS8695_IO_VA, .pfn = __phys_to_pfn(KS8695_IO_PA), .length = KS8695_IO_SIZE, .type = MT_DEVICE, diff --git a/arch/arm/mach-ks8695/include/mach/hardware.h b/arch/arm/mach-ks8695/include/mach/hardware.h index 5e0c388..5090338 100644 --- a/arch/arm/mach-ks8695/include/mach/hardware.h +++ b/arch/arm/mach-ks8695/include/mach/hardware.h @@ -33,7 +33,7 @@ * head debug code as the initial MMU setup only deals in L1 sections. */ #define KS8695_IO_PA 0x03F00000 -#define KS8695_IO_VA 0xF0000000 +#define KS8695_IO_VA IOMEM(0xF0000000) #define KS8695_IO_SIZE SZ_1M #define KS8695_PCIMEM_PA 0x60000000 diff --git a/arch/arm/mach-ks8695/include/mach/uncompress.h b/arch/arm/mach-ks8695/include/mach/uncompress.h index 9495cb4..8879d61 100644 --- a/arch/arm/mach-ks8695/include/mach/uncompress.h +++ b/arch/arm/mach-ks8695/include/mach/uncompress.h @@ -19,15 +19,15 @@ static void putc(char c) { - while (!(__raw_readl(KS8695_UART_PA + KS8695_URLS) & URLS_URTHRE)) + while (!(__raw_readl((void __iomem*)KS8695_UART_PA + KS8695_URLS) & URLS_URTHRE)) barrier(); - __raw_writel(c, KS8695_UART_PA + KS8695_URTH); + __raw_writel(c, (void __iomem*)KS8695_UART_PA + KS8695_URTH); } static inline void flush(void) { - while (!(__raw_readl(KS8695_UART_PA + KS8695_URLS) & URLS_URTE)) + while (!(__raw_readl((void __iomem*)KS8695_UART_PA + KS8695_URLS) & URLS_URTE)) barrier(); }