From patchwork Fri Dec 10 11:05:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 398132 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 oBAB6AXY013592 for ; Fri, 10 Dec 2010 11:06:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754271Ab0LJLGH (ORCPT ); Fri, 10 Dec 2010 06:06:07 -0500 Received: from d1.icnet.pl ([212.160.220.21]:48334 "EHLO d1.icnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752257Ab0LJLGF (ORCPT ); Fri, 10 Dec 2010 06:06:05 -0500 Received: from 87-205-12-81.ip.netia.com.pl ([87.205.12.81] helo=vclass.intranet) by d1.icnet.pl with asmtp (TLS-1.0:DHE_RSA_AES_128_CBC_SHA:16) (Exim 4.34) id 1PR0nc-0007r5-49; Fri, 10 Dec 2010 12:06:04 +0100 From: Janusz Krzysztofik Organization: Tele-Info-System, Poznan, PL To: "linux-omap@vger.kernel.org" Subject: [PATCH 2/2] OMAP1: Amstrad Delta: reserve memory for camera Date: Fri, 10 Dec 2010 12:05:28 +0100 User-Agent: KMail/1.9.10 Cc: Tony Lindgren , Linux Media Mailing List , Guennadi Liakhovetski , linux-arm-kernel@lists.infradead.org References: <201012051929.07220.jkrzyszt@tis.icnet.pl> <201012101159.21845.jkrzyszt@tis.icnet.pl> In-Reply-To: <201012101159.21845.jkrzyszt@tis.icnet.pl> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201012101205.29696.jkrzyszt@tis.icnet.pl> X-SA-Exim-Scanned: No (on d1.icnet); SAEximRunCond expanded to false Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 10 Dec 2010 11:06:10 +0000 (UTC) --- linux-2.6.37-rc4/arch/arm/mach-omap1/board-ams-delta.c.orig 2010-12-04 18:05:25.000000000 +0100 +++ linux-2.6.37-rc4/arch/arm/mach-omap1/board-ams-delta.c 2010-12-04 22:19:39.000000000 +0100 @@ -262,6 +262,16 @@ static struct omap1_cam_platform_data am .lclk_khz_max = 1334, /* results in 5fps CIF, 10fps QCIF */ }; +void __init amsdelta_reserve(void) +{ +#if defined(CONFIG_VIDEO_OMAP1) || defined(CONFIG_VIDEO_OMAP1_MODULE) + omap1_camera_reserve(PAGE_SIZE << get_order(352 * 288 * 2 * + OMAP1_CAMERA_MIN_BUF_COUNT(OMAP1_CAM_DMA_CONTIG))); +#endif + + omap_reserve(); +} + static struct platform_device *ams_delta_devices[] __initdata = { &ams_delta_kp_device, &ams_delta_lcd_device, @@ -366,7 +376,7 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (De /* Maintainer: Jonathan McDowell */ .boot_params = 0x10000100, .map_io = ams_delta_map_io, - .reserve = omap_reserve, + .reserve = amsdelta_reserve, .init_irq = ams_delta_init_irq, .init_machine = ams_delta_init, .timer = &omap_timer,