From patchwork Fri Sep 14 21:34:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11445 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 ECF1C23E42 for ; Fri, 14 Sep 2012 21:35:55 +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 C36C5A39255 for ; Fri, 14 Sep 2012 21:35:53 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so3512549iaf.11 for ; Fri, 14 Sep 2012 14:35:53 -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=jFD9LhiYSYiBJq1b1ui72Q9gAIM6LuAhfctX1FrzLVM=; b=oc48jT2E0irGA41QGYvovrK5wfAcZcC3TJj0gg7Gq3PavCDh3+ZPx4l+5e/a/Wrzim B0Y244W4eWcfJjocxJLdXqi8FIfzYWVie7XY3Y0D2R4E5iBuyxQRV9cS2CVX+BUFF9K6 J5+QMF0WpZRti/IqK7jDJsGNwD1hQUY6r4DNpUoffQ4hONsvY1WnGGh1HCtLG3EYvSy8 UMdhHpX+eBGFlrn+SdFaqfWgRG9sVJxS+p4qQitbv2+BhsGfUohvFmQ684qbEVjPW80a m4gzLmAoAq6QVBkXq/DiIbkqmDxGXiToufeRjGP7G/HowiQG7Ote8F55vlou9Wi2roeN nVJQ== Received: by 10.50.191.227 with SMTP id hb3mr107435igc.43.1347658553587; Fri, 14 Sep 2012 14:35:53 -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 ex8csp215443igc; Fri, 14 Sep 2012 14:35:52 -0700 (PDT) Received: by 10.180.14.74 with SMTP id n10mr673961wic.17.1347658552252; Fri, 14 Sep 2012 14:35:52 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.171]) by mx.google.com with ESMTP id a6si1165181wix.26.2012.09.14.14.35.51; Fri, 14 Sep 2012 14:35:52 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.171 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 0MOlGA-1T8o3R1Xq2-005XyX; Fri, 14 Sep 2012 23:35:23 +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 , Imre Kaloz , Krzysztof Halasa Subject: [PATCH 09/24] ARM: ixp4xx: use __iomem pointers for MMIO Date: Fri, 14 Sep 2012 23:34:37 +0200 Message-Id: <1347658492-11608-10-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:qjdHXFt0OGzBBe7zzfj82ethu5hbr5rg2ek3atNt7vH K0l+uwOncVHRQWIiwT0kJfokY/9wSf/im8/dBa1M96YJOA0Skf jxEWJ5BG0YgYGRUkjVl+PHzFSmeOCE/NaU6UjgY3NwbvATgh7s vYW1xaj6ExyWu8eQ9pJP7HaZtFWxjQ1BFwbDKk89GRLU7Erdlx 3PD25/uO050etd1+hu8MpjS7zwX+AFSNCuQhrjpxAoytwUto/U OhTA9w03QdJ34Y2P3LsORPL++342Nt3H2K2ukYHHbbPZcAZCQq NMwbZx/02le7bSjPYzw2yY7GplXUujHJN9Y/ERrX+LxAEq9e8H G/7IDSaPJgFFgNsE5BJFe1A5kxq0JJV05eX/jTOxtEevAzUBgi HEtz2GKRs6BgA== X-Gm-Message-State: ALoCoQlDBfUqGOPDWT2XsWczAJuaFXcC5npobWB6vyj5BB2QIbY3cUSXry/xs5qxGPbhqbWATbGJ ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. At the moment, this patch conflicts with other patches in linux-next, need to sort this out. Cc: Imre Kaloz Cc: Krzysztof Halasa Signed-off-by: Arnd Bergmann --- arch/arm/mach-ixp4xx/common.c | 2 +- arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 8c9cd5d..fdf91a1 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c @@ -70,7 +70,7 @@ static struct map_desc ixp4xx_io_desc[] __initdata = { }, #ifdef CONFIG_DEBUG_LL { /* Debug UART mapping */ - .virtual = IXP4XX_DEBUG_UART_BASE_VIRT, + .virtual = (unsigned long)IXP4XX_DEBUG_UART_BASE_VIRT, .pfn = __phys_to_pfn(IXP4XX_DEBUG_UART_BASE_PHYS), .length = IXP4XX_DEBUG_UART_REGION_SIZE, .type = MT_DEVICE diff --git a/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h b/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h index 2272f5a..eb68b61 100644 --- a/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h +++ b/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h @@ -49,21 +49,21 @@ * Expansion BUS Configuration registers */ #define IXP4XX_EXP_CFG_BASE_PHYS (0xC4000000) -#define IXP4XX_EXP_CFG_BASE_VIRT (0xFFBFE000) +#define IXP4XX_EXP_CFG_BASE_VIRT IOMEM(0xFFBFE000) #define IXP4XX_EXP_CFG_REGION_SIZE (0x00001000) /* * PCI Config registers */ #define IXP4XX_PCI_CFG_BASE_PHYS (0xC0000000) -#define IXP4XX_PCI_CFG_BASE_VIRT (0xFFBFF000) +#define IXP4XX_PCI_CFG_BASE_VIRT IOMEM(0xFFBFF000) #define IXP4XX_PCI_CFG_REGION_SIZE (0x00001000) /* * Peripheral space */ #define IXP4XX_PERIPHERAL_BASE_PHYS (0xC8000000) -#define IXP4XX_PERIPHERAL_BASE_VIRT (0xFFBEB000) +#define IXP4XX_PERIPHERAL_BASE_VIRT IOMEM(0xFFBEB000) #define IXP4XX_PERIPHERAL_REGION_SIZE (0x00013000) /* @@ -73,7 +73,7 @@ * aligned so that it * can be used with the low-level debug code. */ #define IXP4XX_DEBUG_UART_BASE_PHYS (0xC8000000) -#define IXP4XX_DEBUG_UART_BASE_VIRT (0xffb00000) +#define IXP4XX_DEBUG_UART_BASE_VIRT IOMEM(0xffb00000) #define IXP4XX_DEBUG_UART_REGION_SIZE (0x00001000) #define IXP4XX_EXP_CS0_OFFSET 0x00