From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@arm.linux.org.uk (Russell King - ARM Linux) Date: Fri, 6 Jul 2012 18:47:00 +0100 Subject: [PATCH 3/3] Visstrim M10: Add support for Coda. In-Reply-To: <1341579471-25208-4-git-send-email-javier.martin@vista-silicon.com> References: <1341579471-25208-1-git-send-email-javier.martin@vista-silicon.com> <1341579471-25208-4-git-send-email-javier.martin@vista-silicon.com> Message-ID: <20120706174700.GD31508@n2100.arm.linux.org.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.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(-) 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 */