From patchwork Fri Sep 14 21:34:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11436 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 DFA8D23E42 for ; Fri, 14 Sep 2012 21:35:43 +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 682DBA39258 for ; Fri, 14 Sep 2012 21:35:35 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so3512531iaf.11 for ; Fri, 14 Sep 2012 14:35: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=VHLEMrGlzuXZ5GziKSn/NdYFUwZNWGTvgBXAp4f1vsQ=; b=KQwflEGs0nUKrVlYv/1aW5gwDIx+mznt8Lm1HULWv5FW1tCkA9KXLYOd888a2vABYL dIhuy+9T50s5q7qklAH0tOOkIBq7paG+ao+xnNcWzUzRPoF8XnkCq9ukUGqfM9mVBSQ5 6fvZFZUVymwTyVK5eSlcWXiX1jt38K+HaPmYuOu9y7wZxi1Mbla7kY6svxaEvBsJPsI/ gCvlga4VfU+H+knCQBU/ON97h95cUhgKNWurEx+1Bb/oeCdEQtmlnOq6nnm+Js25LgIm 6yH5NhBnJLb04Ka3xVvar+vJVz2TtIpu16V6Yrh+MMwVTmaeOUJB4vrGHUFvcMZ3DDcz qylQ== Received: by 10.50.237.41 with SMTP id uz9mr107930igc.43.1347658535187; Fri, 14 Sep 2012 14:35: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.184.232 with SMTP id ex8csp215420igc; Fri, 14 Sep 2012 14:35:34 -0700 (PDT) Received: by 10.216.245.70 with SMTP id n48mr1987069wer.139.1347658533420; Fri, 14 Sep 2012 14:35:33 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.10]) by mx.google.com with ESMTP id g13si3584284wep.34.2012.09.14.14.35.32; Fri, 14 Sep 2012 14:35:33 -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 0Meu09-1SsemK0tpZ-00P7zm; Fri, 14 Sep 2012 23:35:25 +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 , Alessandro Rubini , Linus Walleij , STEricsson Subject: [PATCH 13/24] ARM: nomadik: use __iomem pointers for MMIO Date: Fri, 14 Sep 2012 23:34:41 +0200 Message-Id: <1347658492-11608-14-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:scx6WOHbfcgLOJhBH7MVQ99ReOMrtQKfNehcYbrZsXo ruNKKKS8/hei1hlhfecpBMG0zl+0G8NnUGrm9o3enoApJ4Dha7 yvjMdEWaAZ0nyzhkxC/XrsmY5duge5qLEy5dMBK07iNqzAqJj8 vbJS1p2KGZBItr/PZ6s2sJAjmf3RYt0lu7l+WLESxG5CnabaPF kJoZv/4CVqg04vWxVSOinvFoeY8M23iVnLIC8/OUYfcWHfuNln NLHDj4sXI2FIP9/pMhAjanKaHe0hPD9BKEJ0JA/ohgDtUWuCSG dalBoy9/NGCJRZZ4rRS2egVABjk/nNEPp3jcRK4M7ypcNDu9Fk AlO7ketoqSTeNU3K/l1PZdmbV4+BI7thZhbtYnnKhHpXKtZN3m EMLeIoGaKae2w== X-Gm-Message-State: ALoCoQlw2fXhw7MxNuwcgmrhMVHBVotYTfaS7kxK9VTQbN++YLIb/WgwDMKRlQwWYFXQlG0W8ziE ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. Cc: Alessandro Rubini Cc: Linus Walleij Cc: STEricsson Signed-off-by: Arnd Bergmann --- arch/arm/mach-nomadik/board-nhk8815.c | 3 +-- arch/arm/mach-nomadik/include/mach/hardware.h | 2 +- arch/arm/mach-nomadik/include/mach/uncompress.h | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index f4535a7..c3841a9 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -112,8 +112,7 @@ static struct mtd_partition nhk8815_partitions[] = { static struct nomadik_nand_platform_data nhk8815_nand_data = { .parts = nhk8815_partitions, .nparts = ARRAY_SIZE(nhk8815_partitions), - .options = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING \ - | NAND_NO_READRDY, + .options = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING, .init = nhk8815_nand_init, }; diff --git a/arch/arm/mach-nomadik/include/mach/hardware.h b/arch/arm/mach-nomadik/include/mach/hardware.h index 6316dba..02035e4 100644 --- a/arch/arm/mach-nomadik/include/mach/hardware.h +++ b/arch/arm/mach-nomadik/include/mach/hardware.h @@ -30,7 +30,7 @@ - NOMADIK_IO_VIRTUAL + NOMADIK_IO_PHYSICAL) /* used in asm code, so no casts */ -#define IO_ADDRESS(x) ((x) - NOMADIK_IO_PHYSICAL + NOMADIK_IO_VIRTUAL) +#define IO_ADDRESS(x) IOMEM((x) - NOMADIK_IO_PHYSICAL + NOMADIK_IO_VIRTUAL) /* * Base address defination for Nomadik Onchip Logic Block diff --git a/arch/arm/mach-nomadik/include/mach/uncompress.h b/arch/arm/mach-nomadik/include/mach/uncompress.h index 071003b..7d4687e 100644 --- a/arch/arm/mach-nomadik/include/mach/uncompress.h +++ b/arch/arm/mach-nomadik/include/mach/uncompress.h @@ -27,10 +27,10 @@ struct amba_device; #include -#define NOMADIK_UART_DR 0x101FB000 -#define NOMADIK_UART_LCRH 0x101FB02c -#define NOMADIK_UART_CR 0x101FB030 -#define NOMADIK_UART_FR 0x101FB018 +#define NOMADIK_UART_DR (void __iomem *)0x101FB000 +#define NOMADIK_UART_LCRH (void __iomem *)0x101FB02c +#define NOMADIK_UART_CR (void __iomem *)0x101FB030 +#define NOMADIK_UART_FR (void __iomem *)0x101FB018 static void putc(const char c) {