From patchwork Wed Jun 1 15:03:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardiner X-Patchwork-Id: 840572 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p51F6YWf025737 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 1 Jun 2011 15:06:56 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QRmxw-00063L-9F; Wed, 01 Jun 2011 15:04:13 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QRmxv-0005az-Hh; Wed, 01 Jun 2011 15:04:11 +0000 Received: from na3sys009aog101.obsmtp.com ([74.125.149.67]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1QRmxP-0005YX-IN for linux-arm-kernel@lists.infradead.org; Wed, 01 Jun 2011 15:03:40 +0000 Received: from mail-qy0-f178.google.com ([209.85.216.178]) (using TLSv1) by na3sys009aob101.postini.com ([74.125.148.12]) with SMTP ID DSNKTeZUyJ+fD75Bz4YU5W4nsWjjkqdi3bpk@postini.com; Wed, 01 Jun 2011 08:03:39 PDT Received: by mail-qy0-f178.google.com with SMTP id 2so3553500qyk.16 for ; Wed, 01 Jun 2011 08:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nanometrics.ca; s=google; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=auC8u3epfrUekfT1vVkAHqPpRzUksz0ipH6vWTpbgKI=; b=KxJrUwRrFlMv6JVwjH5vVEt1kFnbkhj6Wjn61K/WmlOye8/gpsVGuGY+PUk9Wy83sN 8C6fM3RpyzjYyTVOnX1LQiECqMfiKDAMWKQR/oZQuF/Rmdi7V8oafy5hDmcFG+xg0ov3 JQxpLr9jln+j0Z9VbxnT5SSDlYpASaxrSYFNA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=nanometrics.ca; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=H9Sh7BOYNzxJLAY3GixJcM6YI3XuWvEiNzy8ZTCeiqSXG36+pxDwaqa1WIbpm6F4TE aIgZ2H66yrphUs0oSrNivLJSOKRKYg6WF9/bNeXGvGhv9GLM3VPjiPFjUiUQ40u+wUzF mNJJLQLF8jVbwql0WF29w7pBHPY3O5lIuyB34= Received: by 10.224.200.194 with SMTP id ex2mr5067058qab.202.1306940616877; Wed, 01 Jun 2011 08:03:36 -0700 (PDT) Received: from localhost.localdomain ([206.191.47.130]) by mx.google.com with ESMTPS id f16sm714512qck.33.2011.06.01.08.03.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Jun 2011 08:03:35 -0700 (PDT) From: Ben Gardiner To: Sekhar Nori , davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 3/3] [v3] davinci: da850: changed SRAM allocator to shared ram. Date: Wed, 1 Jun 2011 11:03:25 -0400 Message-Id: <9abf8b57b0b664ffc262af63bd0495e9d7c09230.1306940448.git.bengardiner@nanometrics.ca> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: <20110601051753.GA5153@game.jcrosoft.org> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110601_110339_929241_B72C40A2 X-CRM114-Status: GOOD ( 16.21 ) X-Spam-Score: -2.4 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.67 listed in list.dnswl.org] -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: Subhasish Ghosh , Jean-Christophe PLAGNIOL-VILLARD , Russell King - ARM Linux , Sergei Shtylyov , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 01 Jun 2011 15:06:56 +0000 (UTC) From: Subhasish Ghosh This patch modifies the sram allocator to allocate memory from the DA8XX shared RAM. Signed-off-by: Subhasish Ghosh [rebased onto consolidated SRAM patches] Signed-off-by: Ben Gardiner Reviewed-by: Sergei Shtylyov Acked-by: Jean-Christophe PLAGNIOL-VILLARD --- Changes since v2: * Added Jean-Christophe PLAGNIOL-VILLARD's Ack Changes since v1: * re-sorted the new DA8XX_SHARED_RAM_BASE definition in da8xx.h to between DA8XX_AEMIF_CTL_BASE and DA8XX_DDR2_CTL_BASE (Sergei Shtylyov). --- arch/arm/mach-davinci/da850.c | 4 ++-- arch/arm/mach-davinci/include/mach/da8xx.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 904ede9..4781230 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -1093,8 +1093,8 @@ static struct davinci_soc_info davinci_soc_info_da850 = { .gpio_irq = IRQ_DA8XX_GPIO0, .serial_dev = &da8xx_serial_device, .emac_pdata = &da8xx_emac_pdata, - .sram_phys = DA8XX_ARM_RAM_BASE, - .sram_len = SZ_8K, + .sram_phys = DA8XX_SHARED_RAM_BASE, + .sram_len = SZ_128K, .reset_device = &da8xx_wdt_device, }; diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index ad64da7..b67499f 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h @@ -67,6 +67,7 @@ extern unsigned int da850_max_speed; #define DA8XX_AEMIF_CS2_BASE 0x60000000 #define DA8XX_AEMIF_CS3_BASE 0x62000000 #define DA8XX_AEMIF_CTL_BASE 0x68000000 +#define DA8XX_SHARED_RAM_BASE 0x80000000 #define DA8XX_ARM_RAM_BASE 0xffff0000 void __init da830_init(void);