From patchwork Fri Aug 6 13:22:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHDheKAmiBOYXphcmV3aWN6?= X-Patchwork-Id: 117809 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o76DNU7b025784 for ; Fri, 6 Aug 2010 13:23:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934663Ab0HFNWB (ORCPT ); Fri, 6 Aug 2010 09:22:01 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:53626 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933853Ab0HFNUs (ORCPT ); Fri, 6 Aug 2010 09:20:48 -0400 Received: from eu_spt1 (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0L6Q00F5AFQL5M@mailout1.w1.samsung.com>; Fri, 06 Aug 2010 14:20:45 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0L6Q00FHYFQKCP@spt1.w1.samsung.com>; Fri, 06 Aug 2010 14:20:44 +0100 (BST) Received: from pikus.digital.local (unknown [106.116.48.169]) by linux.samsung.com (Postfix) with ESMTP id C87CC270093; Fri, 06 Aug 2010 15:18:21 +0200 (CEST) Date: Fri, 06 Aug 2010 15:22:12 +0200 From: Michal Nazarewicz Subject: [PATCH/RFCv3 6/6] arm: Added CMA to Aquila and Goni In-reply-to: To: linux-mm@kvack.org Cc: Hans Verkuil , Marek Szyprowski , Daniel Walker , Jonathan Corbet , Pawel Osciak , Mark Brown , Hiremath Vaibhav , FUJITA Tomonori , Kyungmin Park , Zach Pfeffer , Russell King , jaeryul.oh@samsung.com, kgene.kim@samsung.com, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Nazarewicz Message-id: <6e351192baf33fefce3fb186e67c4c5f3c7d9d30.1281100495.git.m.nazarewicz@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.1 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT References: <743102607e2c5fb20e3c0676fadbcb93d501a78e.1281100495.git.m.nazarewicz@samsung.com> <6a924738f412a7ad738e99123411b7a20f761ae1.1281100495.git.m.nazarewicz@samsung.com> <05957b9dc9231d296525203d8347d4c9c5246c15.1281100495.git.m.nazarewicz@samsung.com> 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 (demeter.kernel.org [140.211.167.41]); Fri, 06 Aug 2010 13:23:31 +0000 (UTC) diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index 0992618..e99fe4c 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -454,6 +455,35 @@ static void __init aquila_map_io(void) s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs)); } +static void __init aquila_reserve(void) +{ + static struct cma_region regions[] = { + { + .name = "fw", + .size = 1 << 20, + { .alignment = 128 << 10 }, + }, + { + .name = "b1", + .size = 32 << 20, + .asterisk = 1, + }, + { + .name = "b2", + .size = 16 << 20, + .start = 0x40000000, + .asterisk = 1, + }, + { } + }; + + static const char map[] __initconst = + "s3c-mfc5/f=fw;s3c-mfc5/a=b1;s3c-mfc5/b=b2"; + + cma_set_defaults(regions, map); + cma_early_regions_reserve(NULL); +} + static void __init aquila_machine_init(void) { /* PMIC */ @@ -478,4 +508,5 @@ MACHINE_START(AQUILA, "Aquila") .map_io = aquila_map_io, .init_machine = aquila_machine_init, .timer = &s3c24xx_timer, + .reserve = aquila_reserve, MACHINE_END diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index 7b18505..42549e9 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -435,6 +436,35 @@ static void __init goni_map_io(void) s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs)); } +static void __init goni_reserve(void) +{ + static struct cma_region regions[] = { + { + .name = "fw", + .size = 1 << 20, + { .alignment = 128 << 10 }, + }, + { + .name = "b1", + .size = 32 << 20, + .asterisk = 1, + }, + { + .name = "b2", + .size = 16 << 20, + .start = 0x40000000, + .asterisk = 1, + }, + { } + }; + + static const char map[] __initconst = + "s3c-mfc5/f=fw;s3c-mfc5/a=b1;s3c-mfc5/b=b2"; + + cma_set_defaults(regions, map); + cma_early_regions_reserve(NULL); +} + static void __init goni_machine_init(void) { /* PMIC */ @@ -456,4 +486,5 @@ MACHINE_START(GONI, "GONI") .map_io = goni_map_io, .init_machine = goni_machine_init, .timer = &s3c24xx_timer, + .reserve = goni_reserve, MACHINE_END