From patchwork Mon Aug 22 11:05:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tixy X-Patchwork-Id: 1084982 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7MB6A0S022308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 22 Aug 2011 11:06:31 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QvSKL-0003a3-BF; Mon, 22 Aug 2011 11:05:57 +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 1QvSKK-0003rn-TC; Mon, 22 Aug 2011 11:05:56 +0000 Received: from smarthost03.mail.zen.net.uk ([212.23.3.142]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QvSKH-0003rU-QP for linux-arm-kernel@lists.infradead.org; Mon, 22 Aug 2011 11:05:55 +0000 Received: from [82.69.122.217] (helo=[192.168.2.20]) by smarthost03.mail.zen.net.uk with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1QvSKF-0004Ai-2b; Mon, 22 Aug 2011 11:05:51 +0000 Subject: Re: [PATCH 06/12] ARM: mxc: Setup consistent dma size at boot time From: Tixy To: Sascha Hauer In-Reply-To: <20110819170007.GT31404@pengutronix.de> References: <1312813712-22808-1-git-send-email-tixy@yxit.co.uk> <1312813712-22808-7-git-send-email-tixy@yxit.co.uk> <20110808164731.GP31404@pengutronix.de> <1313655216.2254.9.camel@computer2> <20110818185128.GQ31404@pengutronix.de> <1313744901.28978.16.camel@computer2> <20110819170007.GT31404@pengutronix.de> Date: Mon, 22 Aug 2011 12:05:50 +0100 Message-ID: <1314011150.3604.9.camel@computer2> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 X-Originating-Smarthost03-IP: [82.69.122.217] X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110822_070554_016254_EF3C58E4 X-CRM114-Status: GOOD ( 14.02 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.23.3.142 listed in list.dnswl.org] Cc: Amit Kucheria , 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: , 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 (demeter2.kernel.org [140.211.167.43]); Mon, 22 Aug 2011 11:06:31 +0000 (UTC) Hi Sascha, does the following revised patch gain receive your Acked-by?... From: Jon Medhurst All in tree MX boards using video use memblock_* functions to get their coherent dma space for the camera, so there is no need to increase CONSISTENT_DMA_SIZE beyond the default and we can simply remove the defines which do this. Signed-off-by: Jon Medhurst CC: Sascha Hauer Acked-by: Sascha Hauer --- arch/arm/plat-mxc/include/mach/memory.h | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index 11be5cd..3ec84b9 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -40,19 +40,4 @@ # endif #endif -#if defined(CONFIG_MX3_VIDEO) -/* - * Increase size of DMA-consistent memory region. - * This is required for mx3 camera driver to capture at least two QXGA frames. - */ -#define CONSISTENT_DMA_SIZE SZ_8M - -#elif defined(CONFIG_MX1_VIDEO) || defined(CONFIG_VIDEO_MX2_HOSTSUPPORT) -/* - * Increase size of DMA-consistent memory region. - * This is required for i.MX camera driver to capture at least four VGA frames. - */ -#define CONSISTENT_DMA_SIZE SZ_4M -#endif /* CONFIG_MX1_VIDEO || CONFIG_VIDEO_MX2_HOSTSUPPORT */ - #endif /* __ASM_ARCH_MXC_MEMORY_H__ */