From patchwork Mon Jun 15 16:05:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 30370 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5FG5cMC025559 for ; Mon, 15 Jun 2009 16:05:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757007AbZFOQFe (ORCPT ); Mon, 15 Jun 2009 12:05:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761023AbZFOQFe (ORCPT ); Mon, 15 Jun 2009 12:05:34 -0400 Received: from mail-px0-f189.google.com ([209.85.216.189]:44715 "EHLO mail-px0-f189.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757007AbZFOQFd (ORCPT ); Mon, 15 Jun 2009 12:05:33 -0400 Received: by pxi27 with SMTP id 27so314523pxi.33 for ; Mon, 15 Jun 2009 09:05:36 -0700 (PDT) Received: by 10.142.110.10 with SMTP id i10mr3229584wfc.300.1245081935939; Mon, 15 Jun 2009 09:05:35 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 30sm97559wfa.15.2009.06.15.09.05.34 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 15 Jun 2009 09:05:35 -0700 (PDT) To: Tony Lindgren , Paul Walmsley Cc: linux-omap@vger.kernel.org Subject: Re: [PATCH 0/2] adding back some features References: <1244844693-24126-1-git-send-email-khilman@ti.deeprootsystems.com> <20090615080001.GC4474@atomide.com> <87ski1a6n1.fsf@deeprootsystems.com> From: Kevin Hilman Organization: Deep Root Systems, LLC Date: Mon, 15 Jun 2009 09:05:32 -0700 In-Reply-To: <87ski1a6n1.fsf@deeprootsystems.com> (Kevin Hilman's message of "Mon\, 15 Jun 2009 07\:55\:30 -0700") Message-ID: <87k53da3eb.fsf@deeprootsystems.com> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Kevin Hilman writes: > Tony Lindgren writes: > >> Hi, >> >> * Kevin Hilman [090612 15:13]: >>> Here's a couple patches to add-back some feature dropped in the >>> mainline sync. These are needed for the PM branch among other things. >>> >>> Applies to linux-omap master. >>> >>> Kevin Hilman (1): >>> OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS >> >> Is there any reason to get this one into mainline early? > > Well, the PM branch has a dependency, but also the recenetly submitted > qwatchdog driver has a dependency. > >> If not, I suggest you keep this in your pm branch for next merge >> window that I can keep merging to l-o master as needed. >> >> However, if omap_type() is by other queues earlier, then I can >> add it into my upstream queue. If this blocks several queues >> from being rebased against mainline kernel, that alone might >> already be a good enough reason to get it in early. > > I think it should go via your upstream queue. I imagine some of the > other upcoming driver submissions from TI will have a dependency as > well since there is still some missing EMU/HS support ind drivers. Also, I'm carrying this SRAM patch below for HS/EMU that could go into Paul's SRAM/SDRC queue if this omap_type() gets merged sooner rather than later. Kevin commit 106588e30f070d9a8d5906d409e0b9aad89edc9e Author: Tero Kristo Date: Thu Oct 9 17:47:02 2008 +0300 OMAP3: SRAM size fix for HS/EMU devices Signed-off-by: Tero Kristo Signed-off-by: Kevin Hilman --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c old mode 100644 new mode 100755 index 65006df..f40bd2d --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -131,9 +131,15 @@ void __init omap_detect_sram(void) if (cpu_class_is_omap2()) { if (is_sram_locked()) { if (cpu_is_omap34xx()) { - omap_sram_base = OMAP3_SRAM_PUB_VA; - omap_sram_start = OMAP3_SRAM_PUB_PA; - omap_sram_size = 0x8000; /* 32K */ + if (omap_type() == OMAP2_DEVICE_TYPE_GP) { + omap_sram_base = OMAP3_SRAM_PUB_VA; + omap_sram_start = OMAP3_SRAM_PUB_PA; + omap_sram_size = 0x8000; /* 32K */ + } else { + omap_sram_base = OMAP3_SRAM_PUB_VA; + omap_sram_start = OMAP3_SRAM_PUB_PA; + omap_sram_size = 0x7000; /* 28K */ + } } else { omap_sram_base = OMAP2_SRAM_PUB_VA; omap_sram_start = OMAP2_SRAM_PUB_PA;