From patchwork Fri Sep 14 21:34:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11440 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 CB81D23E42 for ; Fri, 14 Sep 2012 21:35:48 +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 2D62EA39251 for ; Fri, 14 Sep 2012 21:35:44 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so3512549iaf.11 for ; Fri, 14 Sep 2012 14:35:44 -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=/x/ZP5QNRYReLFpSfDUe5Q+8nM/sW79jMoeRkBrUjPo=; b=AILIlQJkH4TeqJaSaHYrnSUAS+oF6DoGb2LVkYEW7d4zSrLkbtjhMcla2wrKS3Wfo+ z6ydALlZVAeLeVNuNDZhKXwonzt+/W15j6+YIMfQlpVQ7INQ9WSfsf2ZtlvY4oZvwSFV Wo4uSiQ6Jmy0siefphas63Zn30fHgoAaHY/qRgD1awP5JPN+FTjQYkyv9U9PUlvv1w19 sH8ZuWLB97rEPSvXeYBbCgpXFrDPQpwPlqZAjbtRZHclmqttwEGADjZqlvbWzgR7nsWJ nuImAMfR4I+ZK8XZjcuC5j5XMmGxypq1d2ezOFmVBImb0gtmfZrbkJUfUKcVwnmLTRQL UEMg== Received: by 10.50.207.106 with SMTP id lv10mr149527igc.0.1347658543814; Fri, 14 Sep 2012 14:35:43 -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 ex8csp215428igc; Fri, 14 Sep 2012 14:35:43 -0700 (PDT) Received: by 10.180.86.133 with SMTP id p5mr674943wiz.17.1347658542399; Fri, 14 Sep 2012 14:35:42 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.10]) by mx.google.com with ESMTP id m46si3540752wea.138.2012.09.14.14.35.41; Fri, 14 Sep 2012 14:35:42 -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 0MCfv0-1TKqkt1d2I-008pF3; 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 , Hartley Sweeten , Ryan Mallon Subject: [PATCH 04/24] ARM: ep93xx: use __iomem pointers for MMIO Date: Fri, 14 Sep 2012 23:34:32 +0200 Message-Id: <1347658492-11608-5-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:sM7BIM67SH/pbgVqhpQpsimhvfLrdI9dCcu0zvp+rjO i01Q74sdLd6qiDaoBGeYfBMup/HiKmoEkmR/AK9KyBOkJh86Tc 939WpAO73HkmkvsN5rZ2pV+xamSuDcWKF1qeBKUTcOuPae3zcc Q466BTjodubkOUt7+REsUpg+gVUDwkI83G/y/Xy55htIE9GbyU RsvA7exurHZXh3gQ0ofhCy7wR9JRGvzNyZ0LKEfiKhAWKqOrBh 3lYtcKpxROjEK+K9+Z9mYfjfibvvRG8SIM1yE+yO1Na0sTQrbp YXLuWsCOTqPgydRiQKWvBNCyMv1ZZUvGUpy7Jt5mXUwnnxXkie +iPkzvGQLeJukaLVCkH8M/9y0G/EofjIFUtW1POgfxbF6IZWIV 5AuKswAwkQf7w== X-Gm-Message-State: ALoCoQmXUk6teXfJ/L+LmA5NVdpyrMT/uy4uh+JsbCOLQkPYFiE+HHyY3UKqz6GBtd9PDZIGy72q ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. Cc: Hartley Sweeten Cc: Ryan Mallon Signed-off-by: Arnd Bergmann --- arch/arm/mach-ep93xx/include/mach/ts72xx.h | 10 +++++----- arch/arm/mach-ep93xx/ts72xx.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-ep93xx/include/mach/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h index f1397a1..071feaa 100644 --- a/arch/arm/mach-ep93xx/include/mach/ts72xx.h +++ b/arch/arm/mach-ep93xx/include/mach/ts72xx.h @@ -14,7 +14,7 @@ */ #define TS72XX_MODEL_PHYS_BASE 0x22000000 -#define TS72XX_MODEL_VIRT_BASE 0xfebff000 +#define TS72XX_MODEL_VIRT_BASE IOMEM(0xfebff000) #define TS72XX_MODEL_SIZE 0x00001000 #define TS72XX_MODEL_TS7200 0x00 @@ -26,7 +26,7 @@ #define TS72XX_OPTIONS_PHYS_BASE 0x22400000 -#define TS72XX_OPTIONS_VIRT_BASE 0xfebfe000 +#define TS72XX_OPTIONS_VIRT_BASE IOMEM(0xfebfe000) #define TS72XX_OPTIONS_SIZE 0x00001000 #define TS72XX_OPTIONS_COM2_RS485 0x02 @@ -34,18 +34,18 @@ #define TS72XX_OPTIONS2_PHYS_BASE 0x22800000 -#define TS72XX_OPTIONS2_VIRT_BASE 0xfebfd000 +#define TS72XX_OPTIONS2_VIRT_BASE IOMEM(0xfebfd000) #define TS72XX_OPTIONS2_SIZE 0x00001000 #define TS72XX_OPTIONS2_TS9420 0x04 #define TS72XX_OPTIONS2_TS9420_BOOT 0x02 -#define TS72XX_RTC_INDEX_VIRT_BASE 0xfebf9000 +#define TS72XX_RTC_INDEX_VIRT_BASE IOMEM(0xfebf9000) #define TS72XX_RTC_INDEX_PHYS_BASE 0x10800000 #define TS72XX_RTC_INDEX_SIZE 0x00001000 -#define TS72XX_RTC_DATA_VIRT_BASE 0xfebf8000 +#define TS72XX_RTC_DATA_VIRT_BASE IOMEM(0xfebf8000) #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000 #define TS72XX_RTC_DATA_SIZE 0x00001000 diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index 75cab2d..faa5bdd 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c @@ -32,27 +32,27 @@ static struct map_desc ts72xx_io_desc[] __initdata = { { - .virtual = TS72XX_MODEL_VIRT_BASE, + .virtual = (unsigned long)TS72XX_MODEL_VIRT_BASE, .pfn = __phys_to_pfn(TS72XX_MODEL_PHYS_BASE), .length = TS72XX_MODEL_SIZE, .type = MT_DEVICE, }, { - .virtual = TS72XX_OPTIONS_VIRT_BASE, + .virtual = (unsigned long)TS72XX_OPTIONS_VIRT_BASE, .pfn = __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE), .length = TS72XX_OPTIONS_SIZE, .type = MT_DEVICE, }, { - .virtual = TS72XX_OPTIONS2_VIRT_BASE, + .virtual = (unsigned long)TS72XX_OPTIONS2_VIRT_BASE, .pfn = __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE), .length = TS72XX_OPTIONS2_SIZE, .type = MT_DEVICE, }, { - .virtual = TS72XX_RTC_INDEX_VIRT_BASE, + .virtual = (unsigned long)TS72XX_RTC_INDEX_VIRT_BASE, .pfn = __phys_to_pfn(TS72XX_RTC_INDEX_PHYS_BASE), .length = TS72XX_RTC_INDEX_SIZE, .type = MT_DEVICE, }, { - .virtual = TS72XX_RTC_DATA_VIRT_BASE, + .virtual = (unsigned long)TS72XX_RTC_DATA_VIRT_BASE, .pfn = __phys_to_pfn(TS72XX_RTC_DATA_PHYS_BASE), .length = TS72XX_RTC_DATA_SIZE, .type = MT_DEVICE,