From patchwork Tue Apr 19 14:16:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 718261 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3JEGf7x023161 for ; Tue, 19 Apr 2011 14:17:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752159Ab1DSORG (ORCPT ); Tue, 19 Apr 2011 10:17:06 -0400 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]:37848 "EHLO na3sys009aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751677Ab1DSORG (ORCPT ); Tue, 19 Apr 2011 10:17:06 -0400 Received: from mail-ww0-f46.google.com ([74.125.82.46]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKTa2ZXm/cL90WNAUE9nN2J+jZ6DKADtb5@postini.com; Tue, 19 Apr 2011 07:17:05 PDT Received: by mail-ww0-f46.google.com with SMTP id 28so7336301wwb.15 for ; Tue, 19 Apr 2011 07:17:00 -0700 (PDT) Received: by 10.227.177.13 with SMTP id bg13mr6311745wbb.92.1303222620484; Tue, 19 Apr 2011 07:17:00 -0700 (PDT) Received: from [192.168.100.101] (a62-248-131-233.elisa-laajakaista.fi [62.248.131.233]) by mx.google.com with ESMTPS id l24sm3919883wbc.47.2011.04.19.07.16.56 (version=SSLv3 cipher=OTHER); Tue, 19 Apr 2011 07:16:58 -0700 (PDT) Subject: Re: [RFC PATCH] Consolidate SRAM support From: Tomi Valkeinen To: Tony Lindgren , Russell King - ARM Linux Cc: Haojian Zhuang , Sekhar Nori , Kevin Hilman , davinci-linux-open-source@linux.davincidsp.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org In-Reply-To: <20110418081743.GH12272@atomide.com> References: <20110415130607.GM1611@n2100.arm.linux.org.uk> <20110416130929.GL4423@n2100.arm.linux.org.uk> <20110418064838.GE12272@atomide.com> <1303110011.2062.7.camel@deskari> <20110418081743.GH12272@atomide.com> Date: Tue, 19 Apr 2011 17:16:55 +0300 Message-ID: <1303222615.32281.91.camel@deskari> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Apr 2011 14:17:20 +0000 (UTC) Hi Tony and Russell, On Mon, 2011-04-18 at 11:17 +0300, Tony Lindgren wrote: > * Tomi Valkeinen [110418 09:57]: > > So, I can make a patch that removes the SRAM support from omapfb, and > > queue it up for the next merge window. > > OK. That patch should probably go into Russell's tree along with > other SRAM related patches to avoid conflicts. Here's a simple patch to remove SRAM support from omapfb. Or more precisely, this just disables it. I started to remove the SRAM support from the drivers, but the patches got quite big and will probably cause conflicts if they reside in somebody else's tree than mine. So I believe it's easiest to divide SRAM FB removal into this patch, handled by Russell (?), and then the rest, handled by me. Is there something else related to OMAP FB than the code removed in this patch that is hindering the SRAM work? Tomi From 8a32eb1762d9ecead1aee08cbe955748d67999fd Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 19 Apr 2011 16:58:51 +0300 Subject: [PATCH] OMAP: Remove reserve_sram calls to omapfb This patch removes calls from arch/arm/plat-omap/sram.c to omapfb_reserve_sram() and omap_vram_reserve_sram(), effectively disabling SRAM support for the old and new display drivers. SRAM code in the display drivers will be removed in separate patches. Signed-off-by: Tomi Valkeinen --- arch/arm/plat-omap/sram.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index a3f50b3..e10eeed 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -32,7 +31,6 @@ #include #include "sram.h" -#include "fb.h" /* XXX These "sideways" includes are a sign that something is wrong */ #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) @@ -170,17 +168,6 @@ static void __init omap_detect_sram(void) omap_sram_size = 0x4000; } } - reserved = omapfb_reserve_sram(omap_sram_start, omap_sram_base, - omap_sram_size, - omap_sram_start + SRAM_BOOTLOADER_SZ, - omap_sram_size - SRAM_BOOTLOADER_SZ); - omap_sram_size -= reserved; - - reserved = omap_vram_reserve_sram(omap_sram_start, omap_sram_base, - omap_sram_size, - omap_sram_start + SRAM_BOOTLOADER_SZ, - omap_sram_size - SRAM_BOOTLOADER_SZ); - omap_sram_size -= reserved; omap_sram_ceil = omap_sram_base + omap_sram_size; }