From patchwork Mon Jul 26 14:11:44 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: 114284 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 o6QEBo6M029247 for ; Mon, 26 Jul 2010 14:11:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754497Ab0GZOLe (ORCPT ); Mon, 26 Jul 2010 10:11:34 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:20949 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752811Ab0GZOKb (ORCPT ); Mon, 26 Jul 2010 10:10:31 -0400 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from eu_spt2 ([210.118.77.14]) by mailout4.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0L6600CKK4PGRT30@mailout4.w1.samsung.com>; Mon, 26 Jul 2010 15:10:28 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0L6600IVT4PFZC@spt2.w1.samsung.com>; Mon, 26 Jul 2010 15:10:28 +0100 (BST) Received: from pikus.digital.local (unknown [106.116.48.169]) by linux.samsung.com (Postfix) with ESMTP id 6119A27004E; Mon, 26 Jul 2010 16:08:26 +0200 (CEST) Date: Mon, 26 Jul 2010 16:11:44 +0200 From: Michal Nazarewicz Subject: [PATCHv2 4/4] arm: Added CMA to Aquila and Goni In-reply-to: <03fd80bba187c767530614402793963d62e44e1c.1280151963.git.m.nazarewicz@samsung.com> To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.arm.linux.org.uk, Hiremath Vaibhav , Marek Szyprowski , Pawel Osciak , Mark Brown , Daniel Walker , Jonathan Corbet , FUJITA Tomonori , Zach Pfeffer , Kyungmin Park , Michal Nazarewicz Message-id: X-Mailer: git-send-email 1.7.1 References: <743102607e2c5fb20e3c0676fadbcb93d501a78e.1280151963.git.m.nazarewicz@samsung.com> <03fd80bba187c767530614402793963d62e44e1c.1280151963.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]); Mon, 26 Jul 2010 14:11:52 +0000 (UTC) diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index 0992618..ab156f9 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,17 @@ static void __init aquila_map_io(void) s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs)); } +static void __init aquila_reserve(void) +{ + static char regions[] __initdata = + "-mfc_fw=1M/128K;mfc_b1=32M;mfc_b2=16M@0x40000000"; + static char map[] __initdata = + "s3c-mfc5/f=mfc_fw;s3c-mfc5/a=mfc_b1;s3c-mfc5/b=mfc_b2"; + + cma_set_defaults(regions, map, NULL); + cma_early_regions_reserve(NULL); +} + static void __init aquila_machine_init(void) { /* PMIC */ @@ -478,4 +490,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..2b0a349 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,17 @@ static void __init goni_map_io(void) s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs)); } +static void __init goni_reserve(void) +{ + static char regions[] __initdata = + "-mfc_fw=1M/128K;mfc_b1=32M;mfc_b2=16M@0x40000000"; + static char map[] __initdata = + "s3c-mfc5/f=mfc_fw;s3c-mfc5/a=mfc_b1;s3c-mfc5/b=mfc_b2"; + + cma_set_defaults(regions, map, NULL); + cma_early_regions_reserve(NULL); +} + static void __init goni_machine_init(void) { /* PMIC */ @@ -456,4 +468,5 @@ MACHINE_START(GONI, "GONI") .map_io = goni_map_io, .init_machine = goni_machine_init, .timer = &s3c24xx_timer, + .reserve = goni_reserve, MACHINE_END