From patchwork Fri Jul 6 17:47:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 1166811 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id DE7F23FC33 for ; Fri, 6 Jul 2012 17:47:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757997Ab2GFRrM (ORCPT ); Fri, 6 Jul 2012 13:47:12 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:39706 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757110Ab2GFRrL (ORCPT ); Fri, 6 Jul 2012 13:47:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Sender:In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=ZWqZPZ0Y8C9q7+Ni73NRvgCiib5p8ySMcchotr7xv2U=; b=joVCLbMI6Vl7Ao/BBhgZlSrKK8h8V57fG+iZ0fMyxZngY8fLBUTeRKK5qNcYzqXIR+ngYaHcXQmkYySgTg6ewBPVEBuHvdoen/0GjJu/+eSy1pJ4Mup7NGvePdm+tLwCwlyh2nsA+2qLkJSPiid8I3v70XBKsV2Sgtzhb+la8x8=; Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]:45151) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1SnCcQ-0001iI-BO; Fri, 06 Jul 2012 18:47:02 +0100 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1SnCcP-0007Vy-2n; Fri, 06 Jul 2012 18:47:01 +0100 Date: Fri, 6 Jul 2012 18:47:00 +0100 From: Russell King - ARM Linux To: Javier Martin Cc: linux-media@vger.kernel.org, fabio.estevam@freescale.com, sakari.ailus@maxwell.research.nokia.com, kernel@pengutronix.de, arnaud.patard@rtp-net.org, mchehab@infradead.org, kyungmin.park@samsung.com, laurent.pinchart@ideasonboard.com, s.nawrocki@samsung.com, p.zabel@pengutronix.de, shawn.guo@linaro.org, linux-arm-kernel@lists.infradead.org, richard.zhu@linaro.org Subject: Re: [PATCH 3/3] Visstrim M10: Add support for Coda. Message-ID: <20120706174700.GD31508@n2100.arm.linux.org.uk> References: <1341579471-25208-1-git-send-email-javier.martin@vista-silicon.com> <1341579471-25208-4-git-send-email-javier.martin@vista-silicon.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1341579471-25208-4-git-send-email-javier.martin@vista-silicon.com> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Fri, Jul 06, 2012 at 02:57:51PM +0200, Javier Martin wrote: > Support the codadx6 that is included in > the i.MX27 SoC. > --- > arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 24 +++++++++++++++++++++--- > 1 file changed, 21 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c > index f76edb9..bee2714 100644 > --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c > +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c > @@ -232,10 +232,10 @@ static void __init visstrim_camera_init(void) > static void __init visstrim_reserve(void) > { > /* reserve 4 MiB for mx2-camera */ > - mx2_camera_base = memblock_alloc(MX2_CAMERA_BUF_SIZE, > + mx2_camera_base = memblock_alloc(2 * MX2_CAMERA_BUF_SIZE, > MX2_CAMERA_BUF_SIZE); > - memblock_free(mx2_camera_base, MX2_CAMERA_BUF_SIZE); > - memblock_remove(mx2_camera_base, MX2_CAMERA_BUF_SIZE); > + memblock_free(mx2_camera_base, 2 * MX2_CAMERA_BUF_SIZE); > + memblock_remove(mx2_camera_base, 2 * MX2_CAMERA_BUF_SIZE); NAK. If you're going to do this please move it to the right API: arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe linux-media" 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/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index f7b074f..c27058e 100644 --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c @@ -32,12 +32,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include @@ -193,10 +193,8 @@ static void __init visstrim_camera_init(void) static void __init visstrim_reserve(void) { /* reserve 4 MiB for mx2-camera */ - mx2_camera_base = memblock_alloc(MX2_CAMERA_BUF_SIZE, + mx2_camera_base = memblock_steal(MX2_CAMERA_BUF_SIZE, MX2_CAMERA_BUF_SIZE); - memblock_free(mx2_camera_base, MX2_CAMERA_BUF_SIZE); - memblock_remove(mx2_camera_base, MX2_CAMERA_BUF_SIZE); } /* GPIOs used as events for applications */