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: 66435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CBED5B70E2 for ; Sat, 2 Oct 2010 02:59:17 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1P1ivp-0003Yb-1b; Fri, 01 Oct 2010 16:58:01 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1P1ive-0003Qp-M3; Fri, 01 Oct 2010 16:57:50 +0000 Received: from eu1sys200aog105.obsmtp.com ([207.126.144.119]) by casper.infradead.org with smtps (Exim 4.72 #1 (Red Hat Linux)) id 1P1eHP-0008Gz-Je; Fri, 01 Oct 2010 12:00:00 +0000 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 Subject: [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-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20101001_125959_961219_5E36BA24 X-CRM114-Status: GOOD ( 10.91 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.1 on casper.infradead.org summary: Content analysis details: (-4.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.126.144.119 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: pratyush.anand@st.com, Viresh Kumar , vipulkumar.samar@st.com, bhupesh.sharma@st.com, armando.visconti@st.com, vipin.kumar@st.com, Shiraz Hashim , rajeev-dlh.kumar@st.com, deepak.sikri@st.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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 }, };