From patchwork Fri Sep 14 21:34:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11428 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 AEFFC23E42 for ; Fri, 14 Sep 2012 21:35:30 +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 43DC1A39253 for ; Fri, 14 Sep 2012 21:35:28 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so3512422iaf.11 for ; Fri, 14 Sep 2012 14:35:28 -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=zQgClj67LFMAk4sKc6bN7nH8T5JcV0Gl/QA/e3JXTe4=; b=ajnztqhk+s10IB+M/RuypFl6NoDRigwiR5gRH9Ypxb7IvCQW7zXPpyzduArnJ7UYL4 Q8JCwFVe37ux8VsMEbatQt+wm/YJKh45bpBrd9wXfSwFVqyAVPdx2x8j810cS+hiGCAR QT7Sg6b+aIxcumq713kZD/WdoyLkuw5kyawM/hj48n6Z0OW3q48VxUd0ZnM243v7kYYg nvGCsegSNx796Eytb6g9WX6c+7DnP9AEfuA00BT0x8+ap28WqhsZ4OL9qEAdFNwVL5Vh cLtKPiKCLY5iFmddrarUBTch4LDBlXUG5etFRkGD/9XBNsVVGjavOd1NJ4aZNTM8XEfI tItg== Received: by 10.50.191.227 with SMTP id hb3mr107089igc.43.1347658527982; Fri, 14 Sep 2012 14:35:27 -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 ex8csp215402igc; Fri, 14 Sep 2012 14:35:27 -0700 (PDT) Received: by 10.204.151.81 with SMTP id b17mr2197316bkw.95.1347658526560; Fri, 14 Sep 2012 14:35:26 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.187]) by mx.google.com with ESMTP id is14si4066974bkc.144.2012.09.14.14.35.26; Fri, 14 Sep 2012 14:35:26 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.187; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.187 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 0M4TFs-1TT67l2eU8-00zIIJ; 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 , Barry Song Subject: [PATCH 14/24] ARM: prima2: use __iomem pointers for MMIO Date: Fri, 14 Sep 2012 23:34:42 +0200 Message-Id: <1347658492-11608-15-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:TvdevrEaPXtYC6ekVQWxBud0429dQ9TTKTTbRGwFWBY myzhHoBFjVcQNoZFrpcp8nX826pBYJ9n9vPU/SzALT9HsySC2p 8ONh3iBHhYYZI77jOXHtMavrtDn8eqzTvHsi8NOLTgACNaN1Zg Pbt/otzYhOpU3BHdJua02nSkf8ste3e2AiBLVe6+n4LxYwy54y +6StUqjebGCy6pzIM3eVW5V/9g4oMyhQNKBKwx8FDngOfDUQv2 99eR6ZJRdBAL3Umxy0f8Zo695+S6OvVqjDm+RKtTGu90n/DtFs dPmt9adaGrycYd56WzisGCp4mJJrtYE4byq2HkQ1Zbg1B+0HTP IsBCpKgN3xrZBgnSG7hY+cENTxP4UcyPaauvGIx1l11l+0X/YA 1OdrWvrCO0BgQ== X-Gm-Message-State: ALoCoQmMnDrluZ9C1Uh7pCLFluISplefsiCqT0mTlrDvTEwTmHuP8sKEccP5SD4sVRHoyOn9IgPS ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. Cc: Barry Song Signed-off-by: Arnd Bergmann --- arch/arm/mach-prima2/include/mach/uncompress.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-prima2/include/mach/uncompress.h b/arch/arm/mach-prima2/include/mach/uncompress.h index 83125c6..0c898fc 100644 --- a/arch/arm/mach-prima2/include/mach/uncompress.h +++ b/arch/arm/mach-prima2/include/mach/uncompress.h @@ -25,11 +25,11 @@ static __inline__ void putc(char c) * during kernel decompression, all mappings are flat: * virt_addr == phys_addr */ - while (__raw_readl(SIRFSOC_UART1_PA_BASE + SIRFSOC_UART_TXFIFO_STATUS) + while (__raw_readl((void __iomem *)SIRFSOC_UART1_PA_BASE + SIRFSOC_UART_TXFIFO_STATUS) & SIRFSOC_UART1_TXFIFO_FULL) barrier(); - __raw_writel(c, SIRFSOC_UART1_PA_BASE + SIRFSOC_UART_TXFIFO_DATA); + __raw_writel(c, (void __iomem *)SIRFSOC_UART1_PA_BASE + SIRFSOC_UART_TXFIFO_DATA); } static inline void flush(void)