From patchwork Thu Sep 13 23:24:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Mallon X-Patchwork-Id: 1454741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (unknown [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 9631EDF24C for ; Thu, 13 Sep 2012 23:45:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TCIlt-0002Gt-KI; Thu, 13 Sep 2012 23:24:33 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TCIlq-0002Gf-Ge for linux-arm-kernel@lists.infradead.org; Thu, 13 Sep 2012 23:24:31 +0000 Received: by obbta17 with SMTP id ta17so5647415obb.36 for ; Thu, 13 Sep 2012 16:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=z/zwhp9hvvN3TKJULE0RPTXrkGRJO0bKWVWhHcKFzXs=; b=R8V2KdpJ5wUBe37exBcnnUKC87dL+AVT45ArZX+R34doKIatAhuqqQ8O2Dh/DoUqA7 yR0ix5LmsIIkcgWgxt54oYO91Jn90RdVkap+oFfptjjEb+P/S6WN59k8yQbDZ1RonnGO zHq4dyK5B7wEOTmH1qP/R79JA7Slu/0F3gQ5m/rm7B5IQXdhEYT3vfffiI6e0damk8Vf SzVkdNS1Bl6954MjjyVtpktZ2jHwF7vkQIqbCQ2OTrWxUqCYkzVwVXvahr0iWAGtZz/v 9/PRM3BFdLLqjx/qEfVEoUUZjhIsZ3sSGC2WfnjBPYTR12OVFHm2HX4MFJ5N+dF4BS4g DD1w== Received: by 10.60.26.133 with SMTP id l5mr921092oeg.60.1347578667213; Thu, 13 Sep 2012 16:24:27 -0700 (PDT) Received: from kiwi.in.ok-labs.com (vl10.gw.ok-labs.com. [58.96.27.158]) by mx.google.com with ESMTPS id a6sm20763950oeh.1.2012.09.13.16.24.23 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Sep 2012 16:24:26 -0700 (PDT) From: Ryan Mallon To: hartleys@visionengravers.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] ep93xx: Fix type error warnings in ts72xx build Date: Fri, 14 Sep 2012 09:24:13 +1000 Message-Id: <1347578654-26483-1-git-send-email-rmallon@gmail.com> X-Mailer: git-send-email 1.7.9.7 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rmallon[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.177 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: kernel@wantstofly.org, arnd@arndb.de, Ryan Mallon X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add IOMEM defines for the TS72xx VIRT_BASE defines to fix type conversion warnings. Signed-off-by: Ryan Mallon Acked-by: Arnd Bergmann --- arch/arm/mach-ep93xx/include/mach/ts72xx.h | 20 ++++++++++++++++---- arch/arm/mach-ep93xx/ts72xx.c | 8 ++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-ep93xx/include/mach/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h index f1397a1..b30deb6 100644 --- a/arch/arm/mach-ep93xx/include/mach/ts72xx.h +++ b/arch/arm/mach-ep93xx/include/mach/ts72xx.h @@ -2,6 +2,11 @@ * arch/arm/mach-ep93xx/include/mach/ts72xx.h */ +#ifndef _TS72XX_H +#define _TS72XX_H + +#include + /* * TS72xx memory map: * @@ -15,6 +20,7 @@ #define TS72XX_MODEL_PHYS_BASE 0x22000000 #define TS72XX_MODEL_VIRT_BASE 0xfebff000 +#define TS72XX_MODEL_VIRT_BASE_IOMEM IOMEM(TS72XX_MODEL_VIRT_BASE) #define TS72XX_MODEL_SIZE 0x00001000 #define TS72XX_MODEL_TS7200 0x00 @@ -27,6 +33,7 @@ #define TS72XX_OPTIONS_PHYS_BASE 0x22400000 #define TS72XX_OPTIONS_VIRT_BASE 0xfebfe000 +#define TS72XX_OPTIONS_VIRT_BASE_IOMEM IOMEM(TS72XX_OPTIONS_VIRT_BASE) #define TS72XX_OPTIONS_SIZE 0x00001000 #define TS72XX_OPTIONS_COM2_RS485 0x02 @@ -35,6 +42,7 @@ #define TS72XX_OPTIONS2_PHYS_BASE 0x22800000 #define TS72XX_OPTIONS2_VIRT_BASE 0xfebfd000 +#define TS72XX_OPTIONS2_VIRT_BASE_IOMEM IOMEM(TS72XX_OPTIONS2_VIRT_BASE) #define TS72XX_OPTIONS2_SIZE 0x00001000 #define TS72XX_OPTIONS2_TS9420 0x04 @@ -42,10 +50,12 @@ #define TS72XX_RTC_INDEX_VIRT_BASE 0xfebf9000 +#define TS72XX_RTC_INDEX_VIRT_BASE_IOMEM IOMEM(TS72XX_RTC_INDEX_VIRT_BASE) #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 IOMEM(TS72XX_RTC_DATA_VIRT_BASE) #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000 #define TS72XX_RTC_DATA_SIZE 0x00001000 @@ -56,7 +66,7 @@ static inline int ts72xx_model(void) { - return __raw_readb(TS72XX_MODEL_VIRT_BASE) & TS72XX_MODEL_MASK; + return __raw_readb(TS72XX_MODEL_VIRT_BASE_IOMEM) & TS72XX_MODEL_MASK; } static inline int board_is_ts7200(void) @@ -86,13 +96,15 @@ static inline int board_is_ts7400(void) static inline int is_max197_installed(void) { - return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) & + return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE_IOMEM) & TS72XX_OPTIONS_MAX197); } static inline int is_ts9420_installed(void) { - return !!(__raw_readb(TS72XX_OPTIONS2_VIRT_BASE) & + return !!(__raw_readb(TS72XX_OPTIONS2_VIRT_BASE_IOMEM) & TS72XX_OPTIONS2_TS9420); } -#endif +#endif /* __ASSEMBLY__ */ + +#endif /* _TS72XX_H */ diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index 75cab2d..aefda11 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c @@ -183,14 +183,14 @@ static void __init ts72xx_register_flash(void) static unsigned char ts72xx_rtc_readbyte(unsigned long addr) { - __raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE); - return __raw_readb(TS72XX_RTC_DATA_VIRT_BASE); + __raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE_IOMEM); + return __raw_readb(TS72XX_RTC_DATA_VIRT_BASE_IOMEM); } static void ts72xx_rtc_writebyte(unsigned char value, unsigned long addr) { - __raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE); - __raw_writeb(value, TS72XX_RTC_DATA_VIRT_BASE); + __raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE_IOMEM); + __raw_writeb(value, TS72XX_RTC_DATA_VIRT_BASE_IOMEM); } static struct m48t86_ops ts72xx_rtc_ops = {