From patchwork Fri Oct 1 11:56:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh KUMAR X-Patchwork-Id: 66386 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ww0-f56.google.com (mail-ww0-f56.google.com [74.125.82.56]) by ozlabs.org (Postfix) with ESMTP id E0908B70DF for ; Fri, 1 Oct 2010 22:00:01 +1000 (EST) Received: by mail-ww0-f56.google.com with SMTP id 14sf1398812wwi.11 for ; Fri, 01 Oct 2010 05:00:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:mime-version:x-beenthere:received :received:received:received:received-spf:received:received:received :received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; bh=e68yVeeo/V/IK7BNrngrI0empHrxu3ii3fyfrf00OUM=; b=W2Rm3YMmSTEwPBjhwdYI9/vTfW3Q2wKLilOa30ipGW27lBMjBxPbPahmeAwaSJn2Um FbfbVbDoNtMkjR06pN7Sy6xbYKrljfxXOFrtZUlFjd5A4OTvRCwj0bgAkOu5E9o3/jzX 44dRrxeEKhGbniLqeHJHF3HpZ/6rhvMjPw9Go= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; b=yXTyWeOzrzkya9z/1tved1f+Ahoc8/aWxogDgduY6f1TV33bwHxn6StzrK+pxTWPcd yFFLOYuZ+m2XN02KeO9DvFxB70X5/JznkmEPlpo/je4mr3dYJbBF+OugoG8iS53nROig urHNjRyug24HHSRMoNVgo0geKKbaYb0yp9wEI= Received: by 10.216.145.90 with SMTP id o68mr1135888wej.23.1285934400028; Fri, 01 Oct 2010 05:00:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.14.36.29 with SMTP id v29ls233671eea.3.p; Fri, 01 Oct 2010 04:59:59 -0700 (PDT) Received: by 10.14.47.131 with SMTP id t3mr463237eeb.26.1285934399636; Fri, 01 Oct 2010 04:59:59 -0700 (PDT) Received: by 10.14.47.131 with SMTP id t3mr463236eeb.26.1285934399613; Fri, 01 Oct 2010 04:59:59 -0700 (PDT) Received: from eu1sys200aog105.obsmtp.com (eu1sys200aog105.obsmtp.com [207.126.144.119]) by gmr-mx.google.com with ESMTP id a48si1119673eei.2.2010.10.01.04.58.11; Fri, 01 Oct 2010 04:59:59 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.119 is neither permitted nor denied by best guess record for domain of viresh.kumar@st.com) client-ip=207.126.144.119; Received: from source ([164.129.1.35]) (using TLSv1) by eu1sys200aob105.postini.com ([207.126.147.11]) with SMTP ID DSNKTKXM0mnsqxal4X4f4kNbODWDOkZ4+qYy@postini.com; Fri, 01 Oct 2010 11:59:59 UTC Received: from zeta.dmz-eu.st.com (ns2.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id ED357D3; Fri, 1 Oct 2010 11:57:51 +0000 (GMT) Received: from mail2.dlh.st.com (mail2.dlh.st.com [10.199.8.22]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 4EA532660; Fri, 1 Oct 2010 11:57:48 +0000 (GMT) Received: from localhost (dlhl0509.dlh.st.com [10.199.7.86]) by mail2.dlh.st.com (MOS 3.8.7a) with ESMTP id CUF00996 (AUTH viresh.kumar@st.com); Fri, 1 Oct 2010 17:27:47 +0530 (IST) From: Viresh KUMAR To: linux-arm-kernel@lists.infradead.org, rtc-linux@googlegroups.com, a.zummo@towertech.it, dbrownell@users.sourceforge.net, linux-usb@vger.kernel.org, linux-input@vger.kernel.org, dmitry.torokhov@gmail.com, linux-mtd@lists.infradead.org, dwmw2@infradead.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: Shiraz Hashim , vipin.kumar@st.com, deepak.sikri@st.com, armando.visconti@st.com, vipulkumar.samar@st.com, rajeev-dlh.kumar@st.com, pratyush.anand@st.com, bhupesh.sharma@st.com, Viresh Kumar Subject: [rtc-linux] [PATCH V2 50/69] ST SPEAr13xx: Modified static mappings Date: Fri, 1 Oct 2010 17:26:10 +0530 Message-Id: <81ee7baeea114d591582d1adf33b67f45af5df12.1285933332.git.viresh.kumar@st.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: References: In-Reply-To: References: X-Original-Sender: viresh.kumar@st.com X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 207.126.144.119 is neither permitted nor denied by best guess record for domain of viresh.kumar@st.com) smtp.mail=viresh.kumar@st.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , From: Shiraz Hashim The new static io mappings map regions in 0xE...,.... space to 0xF...,.... and those in space 0x6...,.... to 0xE...,.... range. This is done to accomodate regions of RAS configuration registers to be used by clock frameowrk and possibly others. Signed-off-by: shiraz hashim Signed-off-by: Deepak Sikri Signed-off-by: Viresh Kumar --- arch/arm/mach-spear13xx/include/mach/hardware.h | 7 ++++++- arch/arm/mach-spear13xx/include/mach/vmalloc.h | 2 +- arch/arm/mach-spear13xx/spear13xx.c | 8 ++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-spear13xx/include/mach/hardware.h b/arch/arm/mach-spear13xx/include/mach/hardware.h index 4abc2c0..44cd0c2 100644 --- a/arch/arm/mach-spear13xx/include/mach/hardware.h +++ b/arch/arm/mach-spear13xx/include/mach/hardware.h @@ -17,7 +17,12 @@ #include /* Vitual to physical translation of statically mapped space */ -#define IO_ADDRESS(x) (x | 0xF0000000) +/* + * if phy_addr is 0x8...,.... and above then map it to 0xF...,.... + * else map it to 0xE...,.... + */ + +#define IO_ADDRESS(x) ((x) | ((((x) >> 31) << 28) | 0xE0000000)) /* typesafe io address */ #define __io_address(n) __io(IO_ADDRESS(n)) diff --git a/arch/arm/mach-spear13xx/include/mach/vmalloc.h b/arch/arm/mach-spear13xx/include/mach/vmalloc.h index 85ad57e..9f329d1 100644 --- a/arch/arm/mach-spear13xx/include/mach/vmalloc.h +++ b/arch/arm/mach-spear13xx/include/mach/vmalloc.h @@ -13,6 +13,6 @@ #ifndef __MACH_VMALLOC_H #define __MACH_VMALLOC_H -#include +#define VMALLOC_END 0xEC800000 #endif /* __MACH_VMALLOC_H */ diff --git a/arch/arm/mach-spear13xx/spear13xx.c b/arch/arm/mach-spear13xx/spear13xx.c index 8c8a21d..d6a6dc0 100644 --- a/arch/arm/mach-spear13xx/spear13xx.c +++ b/arch/arm/mach-spear13xx/spear13xx.c @@ -582,6 +582,14 @@ struct map_desc spear13xx_io_desc[] __initdata = { .pfn = __phys_to_pfn(SPEAR13XX_SYSRAM1_BASE), .length = SZ_1M, .type = MT_MEMORY_NONCACHED +#ifdef CONFIG_MACH_SPEAR1310 + }, { + .virtual = IO_ADDRESS(SPEAR1310_RAS_BASE), + .pfn = __phys_to_pfn(SPEAR1310_RAS_BASE), + .length = SZ_4K, + .type = MT_DEVICE + +#endif }, };