From patchwork Fri Sep 14 21:34:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11426 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 4932723E42 for ; Fri, 14 Sep 2012 21:35:25 +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 72E6AA39240 for ; Fri, 14 Sep 2012 21:35:24 +0000 (UTC) Received: by iafj25 with SMTP id j25so3512422iaf.11 for ; Fri, 14 Sep 2012 14:35:23 -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=Y6NxP1y1LrB0AULQsa9JWTXfD82BrQehpjAjFF8SX2A=; b=S+BDuaLC8JNNwij+ZPaWXFdP2Ygy0+/Of9WpvUhVpOHU3rkuY1im8sQX/GIdkvfr2k D6wbfLO++jAO2x9Bzc7HDWzrcaCSZvh2UdIQd04dXZ51MqyeCNcEOiPLzr8dYjCA9o/i W4xeBTrnt/X+jcHBvlM71ErSoBO4ehGaJRdUP1uc0+T+zrB0s4oR+5M+YXFdu8VtCp3R caJiCIIuBbEDz1zxLwRVtHcmXVkJgwkGRmlzzLULZ1I2vWMnIZymfB8oX9kz83ZAcju4 0trgI1IP2cR4zyKk/3ZtaCqXx8ac9VNkz8/P2Ael18MhJeQ02QeCQoxIRLa6ZPRpJE4J 9buQ== Received: by 10.42.60.139 with SMTP id q11mr3322737ich.53.1347658523833; Fri, 14 Sep 2012 14:35:23 -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 ex8csp215394igc; Fri, 14 Sep 2012 14:35:22 -0700 (PDT) Received: by 10.180.81.99 with SMTP id z3mr7803652wix.0.1347658522111; Fri, 14 Sep 2012 14:35:22 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.9]) by mx.google.com with ESMTP id o9si3537407wea.143.2012.09.14.14.35.21; Fri, 14 Sep 2012 14:35:22 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.9; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.9 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 0M51UE-1TSXtX0Fm2-00yk3x; Fri, 14 Sep 2012 23:35:21 +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 Subject: [PATCH 03/24] ARM: ebsa110: use __iomem pointers for MMIO Date: Fri, 14 Sep 2012 23:34:31 +0200 Message-Id: <1347658492-11608-4-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:3PqDl0tZMEIWB0aHTy+DvuWFjOnIb1TTZVNiF+bW+Oa y9nnmrI3adjWU+D/d8iMazsMdZ1/paOSFbQtLplygVcjJrohD8 9tOfi7JHpcSO7R+66izo3tBsJ3RKUiIKsYE60eevy8rF4PK8r8 bNXgLVXhS/fIRvJwYfk63Wyui6GOfcxky7mcVuJVYja/Fvc1nB 172vr7902KN61M0SgJMkINeft5UG9KhxCdKIL32Xz1o+OgZWVS g5Xav3ShWR8mcwZTTHEmFYriHVZy8+mf+zNtoGLjhfw4KdvnAo vdOli05dOPKLvhC2C7XjUKllLzFuxOVW2a64S40cuuyoDHLJ07 CPBz4a5fQ6NjUQpzIC1WijrrD9e11FgWx4a0sj6IWBRxwROtym EybYd81bq67bg== X-Gm-Message-State: ALoCoQlWjUSy8gcC1M3svWt5FmCL57/d0Vj/FXjWgPm1hhHxa3XSfKnf2alXfZfFdehxLrfp7wQJ ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. Signed-off-by: Arnd Bergmann --- arch/arm/mach-ebsa110/core.c | 8 ++++---- arch/arm/mach-ebsa110/core.h | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c index 6f80686..f0fe6b5 100644 --- a/arch/arm/mach-ebsa110/core.c +++ b/arch/arm/mach-ebsa110/core.c @@ -74,22 +74,22 @@ static struct map_desc ebsa110_io_desc[] __initdata = { * sparse external-decode ISAIO space */ { /* IRQ_STAT/IRQ_MCLR */ - .virtual = IRQ_STAT, + .virtual = (unsigned long)IRQ_STAT, .pfn = __phys_to_pfn(TRICK4_PHYS), .length = TRICK4_SIZE, .type = MT_DEVICE }, { /* IRQ_MASK/IRQ_MSET */ - .virtual = IRQ_MASK, + .virtual = (unsigned long)IRQ_MASK, .pfn = __phys_to_pfn(TRICK3_PHYS), .length = TRICK3_SIZE, .type = MT_DEVICE }, { /* SOFT_BASE */ - .virtual = SOFT_BASE, + .virtual = (unsigned long)SOFT_BASE, .pfn = __phys_to_pfn(TRICK1_PHYS), .length = TRICK1_SIZE, .type = MT_DEVICE }, { /* PIT_BASE */ - .virtual = PIT_BASE, + .virtual = (unsigned long)PIT_BASE, .pfn = __phys_to_pfn(TRICK0_PHYS), .length = TRICK0_SIZE, .type = MT_DEVICE diff --git a/arch/arm/mach-ebsa110/core.h b/arch/arm/mach-ebsa110/core.h index c93c9e4..afe137e 100644 --- a/arch/arm/mach-ebsa110/core.h +++ b/arch/arm/mach-ebsa110/core.h @@ -31,11 +31,11 @@ #define TRICK7_PHYS 0xf3c00000 /* Virtual addresses */ -#define PIT_BASE 0xfc000000 /* trick 0 */ -#define SOFT_BASE 0xfd000000 /* trick 1 */ -#define IRQ_MASK 0xfe000000 /* trick 3 - read */ -#define IRQ_MSET 0xfe000000 /* trick 3 - write */ -#define IRQ_STAT 0xff000000 /* trick 4 - read */ -#define IRQ_MCLR 0xff000000 /* trick 4 - write */ +#define PIT_BASE IOMEM(0xfc000000) /* trick 0 */ +#define SOFT_BASE IOMEM(0xfd000000) /* trick 1 */ +#define IRQ_MASK IOMEM(0xfe000000) /* trick 3 - read */ +#define IRQ_MSET IOMEM(0xfe000000) /* trick 3 - write */ +#define IRQ_STAT IOMEM(0xff000000) /* trick 4 - read */ +#define IRQ_MCLR IOMEM(0xff000000) /* trick 4 - write */ #endif